[wip] more models and unit testing