DONE WORKING ON PART 2