Work on pulling in and cleaning up data