This is the plan then: update and include one class at a time. Starting with the condition class because it’s likely least tied to the outgoing EBGF stuff.
Made a start trying to factor this thing sensibly. Doesn’t build yet.