Changed back so that it doesn't take command line args (for running in Xcode). -DV