Made a bit of progress on the planning-query class (soon to make the switch, which is a big deal).