WIP: Upgrade to ef 6

This is currently broken.