DHill got wave running properly (for the most part)