Progress with formatizing the data...