baby steps
Refractor to proper MVC
Refractor to proper MVC