Before Main and Junit Merge

Upto Main and Junit merge.