refactor me pretty
add wave infoz