first round passing, gotta fix up the orm generator