Handle the init stage a little better I think.