Mistake. Also, need to rework exposed interface.