#1 - cleaning up Data Model and making it work in the Admin as well as DemoSite