Added basic client side