WIP2
Signed-off-by: Michael Weber <michael@xmw.de>