make models pass
wip