Updated main class to be ready for command refactor