Begin adding Universal App support.