Data parsable -- should have gone for serialization from the start
And now commit the rest as well