First step of moving this function over to using a status