Basic Scanning should be working. Still need to test
Commit
a