Started reworking the data handling 2