More work on public interface.