HWX Pull 

Pull request for all HWX changes by Pat