Ongoing actor implementation.

Also some missed templates.