Pre-Rework commit

Big rework is comming! If something goes terribly wrong ...