Part 6 of redonk refactor