Updated _update_Lists to new system. Almost done, still broken.