Added db models
Added more stuff
Updated views hierarchy