Start refactoring
more refactoring
Stuff. Make Proxy working