:gb: Implemented first automated pass at wave formation