Add list, fix things