Slight modification to the file format to make things a bit easier on validation and such, also looks like validation might be working?