WaveRectangleSystem is frustrating me
Before switching to "many original to one actual" approach