Moved commands into seperate class.