Better way of handling status...