Did some code changes, most of the way there.
Tinkering with the layout and gone to two sided, added a few more sensors.