Got parser working correctly