#40 Initialisation process redesign - work in progress