the entire calc

forgot to commit my changes