Merge waveney

This should have everything in it up to this point.