Zwischenstand Reafactoring
Merge branch 'DevLappy'