[KLS]

I've stuck this since it's currently active.

Also yeah the client thing is becoming an issue. I think realistically we're going to have to have a discussion about actually creating our own client sooner or later.