Adding some more models; preparing to implement the basic functionality