Breaking some general functionality in munge and analysis files to get draft done