Merge in initial working version of "actor" tool branch