Move most new container code to recurrent.lua