I've added functionality, yes, but now the client program looks a bit fucking bloated and that's a frustration.