Replace You with Me

Closes #1021