Getting ready for VCS with client