Removed most NSLog statements - ready to turn in as final project