Test merge

This should merge both our latest stuff.