add new files for r2 testing and new user flows