Mostly Working
Merge branch 'iteration4-totalestimate' into dev-iteration4