This is getting added! I figured I'd roll that into a second PR because this one is getting huge.