Work on status stuff - breaks tests.
Small work on async stuff.