Begin implementing entities
Add more classes