Back to work

After a long quiet stretch, work picked back up with a rework of the architecture underneath, so it is ready for what comes next.