Started from scratch. New architecture is better

Starting with 100% coverage integration tests.