calc: progress
calc: resolved conflicts and added notes
calc: struggling along