Changes to add a parse method and its tests. Also change header
locations.