Checkpoint

Various experimental stuff changed. Checking in just to stash it off.