working prototype
merge changes
model tests all working one pending on view