Updated entity framework, refactored puzzle code