[WIP - DO NOT MERGE YET!] Rework

This isn't complete, but the first two commits should be ready.

There is a bug in this where nodebox handles (CDRs apparently) are shifted down and to the right that i'm having trouble finding...