First cut at delaying full initialisation