Added methods, now need to parse and write files...