Refactoring of the Attributes class; much cleaner now -- and potentially more powerful.
Continue tweaking the refactored setup.