Refactored iterator to be called scan. closes #9