New version of Mock (kind of)