Started working on reimplementing the CommandHandler