hopefully fixes data modeling for good