Refactor in progress, all is broken