Add Angle stuff and tests