Massive update to documentation, backend of parser up and running
Fixed merge issues