More changes ... working toward 1.0