Closer to org-agenda nirvana