Move more stuff into init