Add proxy
Remove many threads open while running tests
Start rewriting old methods into new ones