need to fix our data model
load works...yay i think
fixed merge conflict