Started on new data format.  Options to go...