Get data handling done right
Version bump