so many things it's not funny... please be careful merging going forwardgit statusgit status :)