Consider WFT implementation for improvement
See Ed's notes at https://code.ornl.gov/gonzalo_3/to-do/blob/master/doc/ngsts.tex and try to implement that
See Ed's notes at https://code.ornl.gov/gonzalo_3/to-do/blob/master/doc/ngsts.tex and try to implement that