Altered the Entities

Made most of the changes based on the board. I didn't add a couple
things but we can add those as we go.