begin main controller rewrite
resolve conflicts
simplify main controller, remove old files and fix reset button