Working Docker?  Tweaked download and data prep stages