Added some views, fixed up routing/testing