Get more document selection stuff working