Moved the draw method out to the entities. Should be okay for now.