Working on re-shaping raw data. Quite the bugbear.