Updated to work with new schema
Meh blah blah meh meh meh
Small fixes
TODO fixed, still a while to go to finishj Hotplate. It will have taken a year start to finish....