Change status into state, change stage into status
Remove the return
Re-implement the sort