Added lots of list stuff