working on fixes to add all data skipping the ones that break