Started work on removing bad dependency

Between the views and controller