Move things into init