just initiated r g refactor, no actual tests in place yet