Hopefully this clears up the commit mess I have made