In progress: cleaning up data and stuff