Update for Project Iteration 2

Please merge. Thank you