fixed that already
Some refactorings, initial client framework.