Start merging in changes from wave experiment