Tested working version of container solution