First version on 14th after Christoph thesis meet

This is after Chrasten and christoph meetin on 14th feb evening