progress

data format change in progress, tests don't pass :(