Added standalone module
Refactored some of the stubbing stuff
Added stub definition