2.0 user testing branch.

A collection of commits required for the 2.0 user test. Opening a pull request so it's easy to visualize the current state of the user testing branch.

Do not merge.