Added some of the list functionality