Rewrote client and refactored code
0.2.0