More edmx changes!

Refer to commit, review and pull this asap. Database has been wiped.