Added a few more views, this is the version Im submitting