Basic IO + parsing
 some modifications on file
 Warning: these files have never been compiled and tested.
resolve merge conflict