starting wave viz
fix merge conflict
wave object