changes to the TODO
whoops! relying on dynamic scope.