Improve client db

this adds the functionality mentioned in #7 
why bother with this if check? why not _always_ do a lookup