No-list-nodes basically complete. Bit hacky but overall not bad. Probably still unstable, will merge pending a review of the change at the meeting tomorrow