I'm about to trash the EntityFramework stuff so archiving beforehand