Added initial work on munging and plotting