Forgot to commit the important bits... the Entity class and the tests for such