Accel v2 demo prep

Looks reasonable, right?

Needs tests, don't merge yet.