Ok
Merge conflict solved
Thingy survives restarts, matrix init different (There you go Abe))