@jasonrclark if this goes in before your TextBlock subidrectory PR this will most likely be a merge conflict/thing to be aware of.