Halfway to EF

I have setup Fluent rules, as well as restructured data, but I still
need to get it working exactly.
EF working, working out editor

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