Some more munging and starting to work with 2013 data in this commit