Merged both proxy scripts into one (preping for split to new repo)
Fixed a few issues with poxi