This is an experiment initially with the step 1 + 3 of #420. Then I have experimented more with 5 and 8.