Okay I'm 80% sure that I managed to update everything correctly in the OP