Modified the cmd pair to use OOP

Also modified main.cpp to use the new engine