AIA-37 works now, though reasons to refactor increased..