Made some serious changes to the Pump library, and modified the client to work with it. Expect a writeup soon on the api changes.