Proxies

Added proxy structure
Fixed some stuff internal to eclipse/java