Some progress, but tons of problems with regression tests.

See the upcoming flurry of github issues