Initial Enum Changes

Enum readability and make it so NPC's can have an associated profiency.