More selection drawing hackery