I've got a separate PR coming for that one - I want to contain this PR to just the "dist" functionality.