docker intergration and some shock related code reorganizing