This will hopefully update and merge properly - here goes nothing.