Added basic client side surface