#56 - Fleshed out some internals a bit. Wonder if the factory methods could actually just go in the step defs file, although this will be getting bigger and more stuff might be coming out.