Got refactor working

Tested!