More development, breaking wavegen. Yes, I should be doing this in a branch