WIP. Using native surroundContents for now