Adding list support -- in progress