Implemented some proxying goodness. Mm mm mmm