Cleaning up todos
Porting data handling to pandas