Arm Changes

Pull request with arm changes merged in.