Added some model infrastructure
Data models wip