hopefully fixes data modeling for good
Merge branch 'kellybranch'