It's still pretty insane, but at least got the new data models running