moving parser to stack implementation

woooooooooooooooo
Fixed merge conflict