Somehow managed to wipe out changes earlier today. Here they are again.
Committing brunched files.
Fixed a couple tests.