Still tidying apis. And begun implementing tracing.