began filling in Entity and friends, and added some code to the Parser