Manfred dev

see commit comments.