Fixing build issues and also getting EF to persist some data to the current two tables