New, improved parser