Merge all the things for finale changes!