Removed unnecessary complexity from scanner...should also lower memory overhead for files...added BASIC span functionality for tokens