Encapsulated Calc

Final Update