[wip] Massive commit to make sure it is all saved