add ManaSymbol class (not yet integrated)
finish refactoring to get specs passing again