Massive Surface refactor.