Working on the public interface