That was my initial approach, but it meant passing it around more, (because of L#58) so this seemed cleaner.