add deps and initial client setup
fix merge conflicts