WIP - convert from legacy format