Part 3 of the course project