Refactor in progress - adding methods, working packages