Switch to unite 

- This requires some trickery: see unite github