Moves the one handler for the status out of the function as well. It didn't fit in with the function's old name either.
