Class Structure Changes

Recommitted to fix an error with the proxy location variables.