Updated so that it actually packages the client code