Changed namespaces and altered views to have using and model statements, rather than combine them - it makes life easier.
bluh

pretty much updates this branch to master from yesterday