Scanner Upgrades

Want to *officially* pull this in and give me some feedback? I've opened up an Issue tracker on my repo if you find some bugs (or have some suggestions).

Thanks!