Self contained actors

Commits self-contained actors into master