Implemented NLH/AOI solver. Needs testing