updates, still not quite done yet....at least with the instrumentation and signalling