Make overlay task a little more generic, fixes #68