Ferry refactor; new data parser