Large changes, parsing from file