Refactor status handling systems.

Implementation around notification gets better.