Making progress on refactoring object.