And more refactoring... On to the CommandLoop now...