More refactoring, added options to start and stop in addition to create and terminate