Got proxy working, tweaking unit test and stuff.
organizing