First changes to get app to be universal.