still removing all view stuff from the code and placing it in views, mostly removing stuff thou