Creature refactor [WIP] [CR]