Massive updates to handling of init! Hopefully works well...