Working on some client features.