Some client tracking
Welp
Rearrange