stuff again
Merge branch 'Nov29_Nickson' of https://github.com/Thermomiplex/Thermominator into Nov29_Nickson
oli takes all credit for this work, elliot takes all the flack