Changed all views to Class Based Views and done pre-lim final version