added more functions to client handler, still need to work on definitions