Ripped out one-off viewController stuff for universal solution.