Refactored Attrbitues.   Attributes now exist as an enum-keyed map.  Begin work on attack modifier