Multiple remotes phase 2

Some patches on top of @jm3 work

Smoothly smoothing now