initial version of trait panels. Cleared up old data files
merge