Attmepting to merge back to master
Draft complete clients functions and gase file