Trying to resolve nasty conflicts.
Random Refactoring