hooked up infinote to the client-model a little better