Add a better logging routine
Source docker stuff out in own classes