Tweaks to make this actually run and dump output