Updated the v1 R1. Code cleanup, Now utilizes scanner class