Updated parser, still needs to be finished