Iteration 2 version

On Wednesday afternoon, Team members together merge all the code and
files, and refactor all the code.