Yeah, you appear to have added these both here and to ClientInterface.  Can these just live here?