Added Matt and Zach's code to the project