final pass over API.