Sorting out a little bit of a git mess