Done (hopefully) with file parsing