Refactor WIP

Transitioning methodology