More work, mostly on views
Added template, ignored swp and db files