Refactor class; add wave command