Done implementing proxy
(some) tests
More work + tests