1st Merge w/ auth