Reworks Surface for new framework. No test yet