move init stuff out of run