Will be moving over to scala for the client