Did some orginizational stuff... also setup initial client side...