Reworking the init sequence (still broken)