Further development, almost ready to attempt some more proxy testing.