Flesh out mock.feature
Merge pull request #41 from pmorie/dev/cartridge_refactor

Flesh out mock.feature