Updated model
Cleaned up views
go away!