Cleaned Midi up - but integration tests are still all broken until the underlying pieces get plugged together