More parser stuff.
Changed how parsing works, and a slight tweak to token type.