Grr. This self vs. client thing is confusing :/