Merging branches

We can always rewind if there's a problem. All I did was move stuff around.