Started reworking the data handling.