Configurize data

here is my controversial config patch.

IF there are merge conflicts let me know and I will fix my side. should not be much (pending unpushed changes) as I *just* merged upstream into this branch without any conflicts.