Fixed the client. Got rid of the crazy API