Shaf/Ian: make client and jar