More work on DDD

Signed-off-by: Norbo11 <norbo11@googlemail.com>