Update #8

Added proxies (allows for some nice things in the future)