Prepare for UUID changes, also consolidate listeners and rework flag system