partial commit, contains some code for the client side