Add in download and list capabilities