* Cleaned up CommandHandler a lot - split up into separate classes