braindump some pending changes before I get more conflicts