Additional mucking around with functions and scope.