More work on the DataHandler
Cleaning as we go..