Hack together list support, fixes #1