Feature refresh

Iteration 3 complete build