This needs to accept a 'recur' parameter (even if it doesn't do anything atm)