Update to ScannerWrapper to now implement iterator (play nice with for-each loops)