Bringing in Ron's testing branch + latest Duncan's one; enjoy!