Some work on the data extraction stuff, but still requires some thoughts..