Add swing to OO version.