add models and fix schema
Merge branch 'feature/29-modeling-stuff'