Started to rework data extraction, unfinished!