q5 maybe done
Merge branch 'jacob-q5'
q5 in progress