Worked out initial entity and repository kinks