CS31 Project 7 and CS 31 Project 1