Added the client and util from the console version.