MileStone2 Code Commit

Coding complete for M2, write up to come.