Updated to get extraction and basic plotting up