Bit of refactoring and got it to compile

10 jobs for !9 with onestep
merge request