First implementation of separate
More labelling tweaks
Improve demo
Add numeric separators