maybe i should have make a branch ><
still working on Client Class