move stuff out of init