working on merging client
Merging features/integration into master.