Motherfucker, done some things yeeeah
Merge branch 'QMH'
sss