added users and began battles
merging