removed the proxy shit as it was a ridiculous over complication which was only really useful for showing off...
uncommented tests