Final project complete except comments and cleanup