updating this branch with jhqt

confirmed to be working on a mac, need to test on linux