Added AngleCalc and Constructors