Implemented Parse shit.
Fixed merge errors