progress on if parsing