In between switching data to all be tidy

This is more a proof of concept version. Currently in the process of changing all data to be "tidy".