Partially moved into the testing world.  Core application functionality intact.
Merged