docker integration and some shock related code reorganizing