Sprint refactoring (work in progress...)