Mock

Fixes #2 and #3