ClientState done!
- It's a bit of a hack but everything seems to work now.
Merge origin/master