added classes and cdv files for testing