Re-implementing views

Views should be working again now