Add support for new combined status API preview

This seems idiomatic in regards to testing and such. Let me know if I'm missing something.