I tested this and it works.
Not sure what happened to my last commit so this includes that one + reordering the steps.