Major changes to data handling
Messed up