Merge

The commits might look a bit bigger than they are. I started experimenting with `git stash` and I had some unexpected results.