Implement proxy [branch] timeout

Implementation for CIP-120 and CIP-119 (where left uninmplemented)
eclipse stuff should be ignored too