Multiple display list support

Fixes: #1538

Still needs to be rebased.