Separate out an Angle class
Switch over to using the Angle class