Work towards moving Attribute to the core

less player/NPC interconnection