Worked on simplification
merged master into simplification
Removed calc starter. Annotated methods. Mostly code moventment and annotation.
Merge branch 'simplification'