New parser, and a lot of fun stuff