Made some huge changes

Scanner is working now WOOO