Fixed tests and refactored a bit.
Checking in a sample sandbox for experiments.
Just scaffolding out the UI and adjusting some tests that broke as a result.