Committing with all the ugliness before making a problem branch
committing ugliness before fix