Yay
Add user tracking