All done except for reading from file