Add collate, final change to parser

I AM DONE WITH THIS WOOHOO