talk with elijah about what we want here.
(from redmine: created on 2013-02-19, closed on 2013-02-25)