Start of major rework
Signed-off-by: chipmuenk <mail@chipmuenk.de>