Wip/michaelobriena/surface attributes

@ftripier @DnMllr @wgester If you could take a look that would be awesome.  Thanks.