CLI Controller Complete. Needs testing