Working on wave system, still in progress