All things client side

This should be good to merge