Added entities. Need some touching up and some work, but they're there.