Refactoring 90% complete; example usage not yet updated.