much polishing of the api, better skipping analysis to improve speed.