Began refactoring. Preparing to implement CommandWapper & GlobalEngine