more progress on part 1