Another big refactor, this time for rescue time api helper