Continue writing Data Model spec, changes code to follow the spec.