Added views and models, beginning tests