Feature/allow no agency

Supersedes #268