First pass at bringing in new data format, begin ripping out party ordering