new model spec
progress on #99