massig refacoring, backup Zwischenstand.