Public surface under construction