Many changes including class for backing up users