Status refactor, fails blaze-server tests.
Fix blaze client