NOREF: Rewriting some of the parser function to actually work