started fecking about with Proxies - may be overcomplicating the process with layers of indirection...