Making code for wizards more componentised.