Moving #32 in refactor package. Unit test is currently failing.