EF working, working out editor

Had to make some model changes, but everything seems to be working,
merging with Master