Checkpoint for safe keeping
All Entity and Resource construction unit tests pass