Update potato to handle key filtering much more cleanly. Begin writing the client adapter as well