Reviewed Parser
Fixed merge conflict with myself... how even...