Finished the list command and made some predictate renames.