Added a very rough cut of list support