working on part 1, no real changes made