Reshuffled things. Replaced Closure with Proxy.