Added client and strategy simple drafts and tests