started work on moving fk associations away from entity to session