Added more client side components, resolves #116