Editable client status
Merge branch 'Cleanup' of https://github.com/noahpc/WhiteCollar into Cleanup
Editable client status