tiny refactor
Merge branch 'master' of ssh://86.30.118.83/home/pi/teasafe
noappledouble added back in...whoops