Making sure we allways have the correct document

First step of the big changes....