Added some client functionality
still working on basic functionality