Implement surface context initialization
Add support for surface comments