all data elements in, need to debug and fix history