Fix: New 1up doesn't get a unique ID
Merge branch 'rewrite' into synapse-sync