Add crappy client and enhance server