Made some progress on defining the object model