Completed coding, testing, and review of part 2