Move this setup into it's own subvm
Some more role work.