Finished refactoring data structures for proxy, cleaned up compile errors generated by the refactor.