This should merge the Final branch with the master

I hope nothing breaks!