Adding a simple client
Fixing bugs, adding a lookup test