move wq into own module
reindent