Initial clean up and planning before diving into DataHandler code.