started refactor (CLI working)
refactored controller
made controller disabled by default