Adding first pass at client