Rewrite some things

Not a nice protocol but perhaps ready for the lite version

Signed-off-by: Sven Haardiek <Sven@Haardiek.de>