Finished part 1 of final project