Began implementation of new lexing algorithm