more proxy classes, and managing some todos