First portion of Parser. Token class re-written