Yeah, doing this in here makes a lot more sense vs. in the parser.