First iteration for moving over to a new file format