add data files; Major code changes
resolving merge conflicts