Finished Scanner

Scanner should be finished, need to verify