Un-privatizing until I get a better feel for the public interface