tests passing and integration tested with HRangle

Read for official review