Implement a couple entity classes
35 files changed