Added attempt at QUERY_ARRIVE functionality