Close #5 - Easier scanning of entire file