This push has something almost working.  Still some strange transposes...