A whole ton of master commits plus a vox shuttle.

See commit history for details. Lots of commits.