Major cleanup. Made the creature API much nicer