Proper merge this time, I promise!