Ignored the riff-raff, more changes to init, more to come