Adds Surface utility class - Fixes #6