(Lakka) Move more variables over pt. 2