DO NOT PULL THIS IN

I'll be making incremental updates on this but for now it is broken.

Changes in the edmx file need to be made which we will do on Wednesday hopefully.