Updated this abominable branch with actor and simulator modifications.