Almost finished Iteration 3, just a couple more quick fixes.
Merged with master
1. Nearly final version for iteration 3, need to remove mock to finalize it