add deps and initial client setup
Trying to merge changes