Sync code with initial offline dev of "actor" tool