Start putting together a unit test for a pretend client. It's not at the proper abstraction level, but it revealed quite a few bugs that I've started fixing