More playing with the context. I broke something.
Fixed some broke, but code first is angry about namespaces I think