Docker pr

Cleaner commits, please ignore the earlier Docker PR.