Added set method w/test. Refactored.