From a11671030427cf4dced960984225b403c77dbb2c Mon Sep 17 00:00:00 2001
From: Thomas Neumann <thomas@polycode.dk>
Date: Sat, 18 Jan 2025 15:43:06 +0100
Subject: [PATCH] Added support for PumaTracker format.

---
 Documentation/features.html                   |    2 +-
 Documentation/images/editors/pumatracker.png  |    3 +
 .../images/editors/pumatracker_t.png          |    3 +
 Documentation/moduletypes.html                |   14 +
 Format_Descriptions/PumaTracker.txt           |  157 ++
 README.md                                     |    1 +
 .../Containers/GlobalPlayingInfo.cs           |   30 +
 .../PumaTracker/Containers/Instrument.cs      |   16 +
 .../Containers/InstrumentCommand.cs           |   18 +
 .../PumaTracker/Containers/Position.cs        |   16 +
 .../PumaTracker/Containers/Snapshot.cs        |   30 +
 .../Players/PumaTracker/Containers/Track.cs   |   16 +
 .../PumaTracker/Containers/TrackEffect.cs     |   15 +
 .../PumaTracker/Containers/VoiceFlag.cs       |   22 +
 .../PumaTracker/Containers/VoiceInfo.cs       |   65 +
 .../PumaTracker/Containers/VoicePosition.cs   |   17 +
 .../Agents/Players/PumaTracker/PumaTracker.cs |   66 +
 .../Players/PumaTracker/PumaTracker.csproj    |   46 +
 .../Players/PumaTracker/PumaTrackerWorker.cs  | 1361 +++++++++++++++++
 .../Players/PumaTracker/Resources.Designer.cs |  213 +++
 .../Agents/Players/PumaTracker/Resources.resx |  174 +++
 Source/Agents/Players/PumaTracker/Tables.cs   |  322 ++++
 .../NostalgicPlayer/NostalgicPlayer.csproj    |    1 +
 .../NostalgicPlayerConsole.csproj             |    1 +
 Source/NostalgicPlayer.sln                    |   19 +
 .../Package.appxmanifest                      |    8 +
 26 files changed, 2635 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/images/editors/pumatracker.png
 create mode 100644 Documentation/images/editors/pumatracker_t.png
 create mode 100644 Format_Descriptions/PumaTracker.txt
 create mode 100644 Source/Agents/Players/PumaTracker/Containers/GlobalPlayingInfo.cs
 create mode 100644 Source/Agents/Players/PumaTracker/Containers/Instrument.cs
 create mode 100644 Source/Agents/Players/PumaTracker/Containers/InstrumentCommand.cs
 create mode 100644 Source/Agents/Players/PumaTracker/Containers/Position.cs
 create mode 100644 Source/Agents/Players/PumaTracker/Containers/Snapshot.cs
 create mode 100644 Source/Agents/Players/PumaTracker/Containers/Track.cs
 create mode 100644 Source/Agents/Players/PumaTracker/Containers/TrackEffect.cs
 create mode 100644 Source/Agents/Players/PumaTracker/Containers/VoiceFlag.cs
 create mode 100644 Source/Agents/Players/PumaTracker/Containers/VoiceInfo.cs
 create mode 100644 Source/Agents/Players/PumaTracker/Containers/VoicePosition.cs
 create mode 100644 Source/Agents/Players/PumaTracker/PumaTracker.cs
 create mode 100644 Source/Agents/Players/PumaTracker/PumaTracker.csproj
 create mode 100644 Source/Agents/Players/PumaTracker/PumaTrackerWorker.cs
 create mode 100644 Source/Agents/Players/PumaTracker/Resources.Designer.cs
 create mode 100644 Source/Agents/Players/PumaTracker/Resources.resx
 create mode 100644 Source/Agents/Players/PumaTracker/Tables.cs

diff --git a/Documentation/features.html b/Documentation/features.html
index 481d1a06..d07d0d41 100644
--- a/Documentation/features.html
+++ b/Documentation/features.html
@@ -25,7 +25,7 @@
 				<tr><td>
 					<span>
 						<ul>
-							<li>Supports 179 different types of modules (and increasing).</li>
+							<li>Supports 180 different types of modules (and increasing).</li>
 							<li>One of the most accurate players in the world: plays modules like nature intended.</li>
 							<li>Fast and optimized.</li>
 							<li>Edit and save your favorite lists of modules.</li>
diff --git a/Documentation/images/editors/pumatracker.png b/Documentation/images/editors/pumatracker.png
new file mode 100644
index 00000000..4f2a7f54
--- /dev/null
+++ b/Documentation/images/editors/pumatracker.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e599d3ccbc2847de8569577f9459890ed8b499dfa306b95f5b33fff54f120b6c
+size 4938
diff --git a/Documentation/images/editors/pumatracker_t.png b/Documentation/images/editors/pumatracker_t.png
new file mode 100644
index 00000000..ab2d65cd
--- /dev/null
+++ b/Documentation/images/editors/pumatracker_t.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5deb0bf4ca8c08d69ab364bdd1c38519abe47edbb133662f705e40d78bd56574
+size 14714
diff --git a/Documentation/moduletypes.html b/Documentation/moduletypes.html
index da964e21..a7b10249 100644
--- a/Documentation/moduletypes.html
+++ b/Documentation/moduletypes.html
@@ -1952,6 +1952,20 @@
 								</span>
 							</td>
 						</tr>
+						<tr name="P" style="display:none;">
+							<td>
+								<a href="images/editors/pumatracker.png" data-lightbox="image-pumatracker"><img src="images/editors/pumatracker_t.png"/></a>
+							</td>
+							<td>
+								<span>
+									<p><b><i>PumaTracker</i></b> - The original player was ripped from the game Toki and then optimized by Flyspy/Agile. Agile then created an editor based on the replay routine. This player can play those modules.</p>
+									<p class="first"><b>File extension</b></p>
+									<p>.puma</p>
+									<p><b>Player</b></p>
+									<p>PumaTracker</p>
+								</span>
+							</td>
+						</tr>
 						<tr name="P" style="display:none;">
 							<td>
 								<a href="images/editors/pygmypacker.png" data-lightbox="image-pygmypacker"><img src="images/editors/pygmypacker_t.png"/></a>
diff --git a/Format_Descriptions/PumaTracker.txt b/Format_Descriptions/PumaTracker.txt
new file mode 100644
index 00000000..0897f255
--- /dev/null
+++ b/Format_Descriptions/PumaTracker.txt
@@ -0,0 +1,157 @@
+Module format:
+
+ 0             C Module name
+ C             2 Number of positions - 1 (NOP)
+ E             2 Number of tracks (NOT)
+10             2 Number of instruments (NOI)
+12
+14         A * 4 Sample start offsets
+3C         A * 2 Sample lengths in words
+50 (NOP + 1) * E Position list
+    NOT * x      Tracks
+                 Extra "patt" mark
+                 Instruments
+                 Extra "inst" mark
+				 Samples
+
+
+Position list:
+
+ 0 1 Track number for voice 1
+ 1 2 Instrument transpose for voice 1
+ 2 3 Note transpose for voice 1
+ 3 1 Track number for voice 2
+ 4 2 Instrument transpose for voice 2
+ 5 3 Note transpose for voice 2
+ 6 1 Track number for voice 3
+ 7 2 Instrument transpose for voice 3
+ 8 3 Note transpose for voice 3
+ 9 1 Track number for voice 4
+ A 2 Instrument transpose for voice 4
+ B 3 Note transpose for voice 4
+ C 1 Speed
+ D 1 Not used
+
+
+Tracks:
+
+ 0 4 Mark (patt)
+ 4   Track data
+
+AAAAAAAA BBBCCCCC DDDDDDDD EEEEEEEE
+
+A = Note
+B = Effect:
+    0: None
+    1: Set volume
+    2: Portamento down
+    3: Portamento up
+C = Instrument number
+D = Effect argument
+E = Number of rows until next note
+
+
+Instruments
+
+ 0 4 Mark (inst)
+ 4 x Volume data commands (from documentation):
+     * C0-aa-bb-cc
+          aa is the number of the sample (or waveform) used.
+             Numbers between 00 and 09 included are samples.
+             Numbers between 0A and 33 are waveforms.
+          bb is the step to skip waveforms.
+             If bb=0 then there is no effect.
+             If you want to use a sample, you must set bb to 0.
+          cc is the number of waveforms to be played
+
+     * A0-aa-bb-cc: This instruction makes the volume vary.
+          aa is the volume at the beginning.
+          bb is the volume at the end.
+          cc is the length of time to achieve the volume variation.
+
+     * E0-00-00-00: This instruction stops the sound (It cuts the voice).
+
+     * B0-aa-00-00: This instruction is the GOTO or LOOP command.
+              It permits to restarts a sound at any step of the volume sequence
+              (It's used for echo, make a never-ending sound or restart a
+              sound).
+              The aa number is the number of the line to reach multiplied by 4.
+   4 Mark (insf)
+   x Frequency data commands (from documentation):
+     * D0-aa-bb-cc: This instruction keeps the frequency constant.
+          aa is the offset of the note multiplied by 2 (always even) and it's
+             added to the played note. A value of 18 means that the frequency
+             is transposed of 1 octave up.
+          bb is unused.
+          cc is the length of time while the frequency doesn't vary.
+
+     * A0-aa-bb-cc: This instruction makes the frequency vary.
+          aa is a value added to the frequency of the note at the beginning.
+          bb is a value added to the frequency of the note at the end.
+          cc is the number of VBL
+
+     * E0-00-00-00: See above
+	 * B0-aa-00-00:
+
+
+Voice structure:
+
+ 0 4 Hardware register
+ 4 4 Pointer to sample data
+ 8 2 Sample length in words
+ A 2 Period
+ C 2 Volume slide value
+ E 4 Pointer to track
+12 1 Number of rows until next note
+13
+14 1 Flag
+15 1 Volume
+18 1 Instrument transpose
+19 1 Note transpose
+1A 4 Pointer to instrument volume data
+1E 4 Pointer to instrument frequency data
+22 1 Flag
+23
+24 1 Instrument volume data position
+25 1 Instrument frequency data position
+26 1 Volume slide tick counter
+27 1 Volume slide remaining time
+28 1 Volume slide delta
+29 1 Frequency vary tick counter
+2A 1 Volume slide direction
+2B
+2C 2 Frequency vary value
+2E
+30 4 Frequency vary add value
+34 1 Waveform add value
+35 1 Waveform number
+36 1 Number of waveforms to change
+37
+38 2 Portamento effect add value
+3A 1 Transposed note
+
+
+
+
+6C0 M       Modul data
+6C4         Voice 1
+700         Voice 2
+73C         Voice 3
+778         Voice 4
+7B4     130 Speed counter
+7B5     131 Current row number
+7B6 M2  132 Current position
+7B7
+    260 134 Current speed
+	    136 ??
+		138 ??
+		13A ???
+
+7B8 M4      Period table
+84A M5      Empty instrument
+852 M6      Pointer til instruments: volume, frequency
+95A M7      Pointer til tracks
+B5A M8      Pointer til sample data
+B82         Pointer til waveforms (0x20 bytes stykket, 0x2A ialt)
+C2A M9      Sample lengths
+C92 M10     Waveforms
diff --git a/README.md b/README.md
index c30d2a49..2c8cfaeb 100644
--- a/README.md
+++ b/README.md
@@ -168,6 +168,7 @@ Modules in all supported formats can be found on my homepage at https://nostalgi
 | ProRunner 2 | .pr2 / .pru2 | ProWizard | ModTracker |
 | ProTracker | .mod | | ModTracker |
 | ProTracker IFF | .ptm | | ModTracker |
+| PumaTracker | .puma | | PumaTracker |
 | Pygmy Packer | .pyg | ProWizard | ModTracker |
 | Quadra Composer | .emod | | Quadra Composer |
 | RIFF-WAVE (ADPCM) | .wav | | Sample |
diff --git a/Source/Agents/Players/PumaTracker/Containers/GlobalPlayingInfo.cs b/Source/Agents/Players/PumaTracker/Containers/GlobalPlayingInfo.cs
new file mode 100644
index 00000000..2db713d0
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Containers/GlobalPlayingInfo.cs
@@ -0,0 +1,30 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+using Polycode.NostalgicPlayer.Kit.Interfaces;
+
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers
+{
+	/// <summary>
+	/// Holds global information about the playing state
+	/// </summary>
+	internal class GlobalPlayingInfo : IDeepCloneable<GlobalPlayingInfo>
+	{
+		public byte CurrentSpeed;
+		public byte SpeedCounter;
+		public sbyte CurrentPosition;
+		public byte CurrentRowNumber;
+
+		/********************************************************************/
+		/// <summary>
+		/// Make a deep copy of the current object
+		/// </summary>
+		/********************************************************************/
+		public GlobalPlayingInfo MakeDeepClone()
+		{
+			return (GlobalPlayingInfo)MemberwiseClone();
+		}
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/Containers/Instrument.cs b/Source/Agents/Players/PumaTracker/Containers/Instrument.cs
new file mode 100644
index 00000000..6887a7f9
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Containers/Instrument.cs
@@ -0,0 +1,16 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers
+{
+	/// <summary>
+	/// Holds information about a single instrument
+	/// </summary>
+	internal class Instrument
+	{
+		public InstrumentCommand[] VolumeCommands;
+		public InstrumentCommand[] FrequencyCommands;
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/Containers/InstrumentCommand.cs b/Source/Agents/Players/PumaTracker/Containers/InstrumentCommand.cs
new file mode 100644
index 00000000..a376f783
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Containers/InstrumentCommand.cs
@@ -0,0 +1,18 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers
+{
+	/// <summary>
+	/// Holds information about a single command (both volume and frequency)
+	/// </summary>
+	internal class InstrumentCommand
+	{
+		public byte Command;
+		public byte Argument1;
+		public byte Argument2;
+		public byte Argument3;
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/Containers/Position.cs b/Source/Agents/Players/PumaTracker/Containers/Position.cs
new file mode 100644
index 00000000..3b604d1c
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Containers/Position.cs
@@ -0,0 +1,16 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers
+{
+	/// <summary>
+	/// Holds information about a single position
+	/// </summary>
+	internal class Position
+	{
+		public readonly VoicePosition[] VoicePosition = new VoicePosition[4];
+		public byte Speed;
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/Containers/Snapshot.cs b/Source/Agents/Players/PumaTracker/Containers/Snapshot.cs
new file mode 100644
index 00000000..3eb54e5b
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Containers/Snapshot.cs
@@ -0,0 +1,30 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+using Polycode.NostalgicPlayer.Kit.Interfaces;
+using Polycode.NostalgicPlayer.Kit.Utility;
+
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers
+{
+	/// <summary>
+	/// Holds all the information about the player state at a specific time
+	/// </summary>
+	internal class Snapshot : ISnapshot
+	{
+		public GlobalPlayingInfo PlayingInfo;
+		public VoiceInfo[] Voices;
+
+		/********************************************************************/
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/********************************************************************/
+		public Snapshot(GlobalPlayingInfo playingInfo, VoiceInfo[] voices)
+		{
+			PlayingInfo = playingInfo.MakeDeepClone();
+			Voices = ArrayHelper.CloneObjectArray(voices);
+		}
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/Containers/Track.cs b/Source/Agents/Players/PumaTracker/Containers/Track.cs
new file mode 100644
index 00000000..55347e3c
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Containers/Track.cs
@@ -0,0 +1,16 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers
+{
+	internal class Track
+	{
+		public byte Note;
+		public byte Instrument;
+		public TrackEffect Effect;
+		public byte EffectArgument;
+		public byte RowsToWait;
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/Containers/TrackEffect.cs b/Source/Agents/Players/PumaTracker/Containers/TrackEffect.cs
new file mode 100644
index 00000000..bd029498
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Containers/TrackEffect.cs
@@ -0,0 +1,15 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers
+{
+	internal enum TrackEffect
+	{
+		None = 0,
+		SetVolume,
+		PortamentoDown,
+		PortamentoUp
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/Containers/VoiceFlag.cs b/Source/Agents/Players/PumaTracker/Containers/VoiceFlag.cs
new file mode 100644
index 00000000..c85eb329
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Containers/VoiceFlag.cs
@@ -0,0 +1,22 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+using System;
+
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	[Flags]
+	internal enum VoiceFlag
+	{
+		None = 0,
+		SetVolumeSlide = 0x01,
+		SetFrequency = 0x02,
+		VoiceRunning = 0x04,
+		NoLoop = 0x08,
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/Containers/VoiceInfo.cs b/Source/Agents/Players/PumaTracker/Containers/VoiceInfo.cs
new file mode 100644
index 00000000..3546ebb1
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Containers/VoiceInfo.cs
@@ -0,0 +1,65 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+using Polycode.NostalgicPlayer.Kit.Interfaces;
+
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers
+{
+	/// <summary>
+	/// Holds playing information for a single voice
+	/// </summary>
+	internal class VoiceInfo : IDeepCloneable<VoiceInfo>
+	{
+		public Track[] Track;
+		public int TrackPosition;
+
+		public byte RowCounter;
+
+		public InstrumentCommand[] VolumeCommands;
+		public byte VolumeCommandPosition;
+
+		public InstrumentCommand[] FrequencyCommands;
+		public byte FrequencyCommandPosition;
+
+		public sbyte InstrumentTranspose;
+		public sbyte NoteTranspose;
+		public byte TransposedNote;
+
+		public byte[] SampleData;
+		public ushort SampleLength;
+		public byte SampleNumber;
+
+		public ushort Period;
+		public byte Volume;
+
+		public short PortamentoAddValue;
+
+		public VoiceFlag VoiceFlag;
+
+		public byte VolumeSlideCounter;
+		public byte VolumeSlideRemainingTime;
+		public sbyte VolumeSlideDelta;
+		public sbyte VolumeSlideDirection;
+		public short VolumeSlideValue;
+
+		public byte FrequencyCounter;
+		public int FrequencyVaryAddValue;
+		public int FrequencyVaryValue;
+
+		public byte WaveformChangeCounter;
+		public sbyte WaveformAddValue;
+		public sbyte WaveformValue;
+
+		/********************************************************************/
+		/// <summary>
+		/// Make a deep copy of the current object
+		/// </summary>
+		/********************************************************************/
+		public VoiceInfo MakeDeepClone()
+		{
+			return (VoiceInfo)MemberwiseClone();
+		}
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/Containers/VoicePosition.cs b/Source/Agents/Players/PumaTracker/Containers/VoicePosition.cs
new file mode 100644
index 00000000..76a8894d
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Containers/VoicePosition.cs
@@ -0,0 +1,17 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers
+{
+	/// <summary>
+	/// Holds information about a position for a single voice
+	/// </summary>
+	internal class VoicePosition
+	{
+		public byte TrackNumber;
+		public sbyte InstrumentTranspose;
+		public sbyte NoteTranspose;
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/PumaTracker.cs b/Source/Agents/Players/PumaTracker/PumaTracker.cs
new file mode 100644
index 00000000..9c709660
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/PumaTracker.cs
@@ -0,0 +1,66 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+using System;
+using System.Runtime.InteropServices;
+using Polycode.NostalgicPlayer.Kit.Bases;
+using Polycode.NostalgicPlayer.Kit.Containers;
+using Polycode.NostalgicPlayer.Kit.Interfaces;
+
+// This is needed to uniquely identify this agent
+[assembly: Guid("52013F5E-B82E-44D6-BE5C-53DB93CEFDBC")]
+
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker
+{
+	/// <summary>
+	/// NostalgicPlayer agent interface implementation
+	/// </summary>
+	public class PumaTracker : AgentBase
+	{
+		private static readonly Guid Agent1Id = Guid.Parse("914741F8-625F-4E82-B925-AF85BB21E54E");
+
+		#region IAgent implementation
+		/********************************************************************/
+		/// <summary>
+		/// Returns the name of this agent
+		/// </summary>
+		/********************************************************************/
+		public override string Name => Resources.IDS_PUMA_NAME;
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Returns a description of this agent
+		/// </summary>
+		/********************************************************************/
+		public override string Description => Resources.IDS_PUMA_DESCRIPTION;
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Returns all the formats/types this agent supports
+		/// </summary>
+		/********************************************************************/
+		public override AgentSupportInfo[] AgentInformation =>
+		[
+			new AgentSupportInfo(Resources.IDS_PUMA_NAME_AGENT1, Resources.IDS_PUMA_DESCRIPTION_AGENT1, Agent1Id)
+		];
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Creates a new worker instance
+		/// </summary>
+		/********************************************************************/
+		public override IAgentWorker CreateInstance(Guid typeId)
+		{
+			return new PumaTrackerWorker();
+		}
+		#endregion
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/PumaTracker.csproj b/Source/Agents/Players/PumaTracker/PumaTracker.csproj
new file mode 100644
index 00000000..d1fc825c
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/PumaTracker.csproj
@@ -0,0 +1,46 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <RootNamespace>Polycode.NostalgicPlayer.Agent.Player.PumaTracker</RootNamespace>
+    <Authors>Thomas Neumann</Authors>
+    <Company>Polycode</Company>
+    <Product>NostalgicPlayer</Product>
+    <Description>Plays modules of type PumaTracker</Description>
+    <Version>2.0.0</Version>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>bin\PumaTracker.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\PumaTracker.xml</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+    <WarningsAsErrors />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\NostalgicPlayerKit\NostalgicPlayerKit.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/Source/Agents/Players/PumaTracker/PumaTrackerWorker.cs b/Source/Agents/Players/PumaTracker/PumaTrackerWorker.cs
new file mode 100644
index 00000000..ebe467c6
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/PumaTrackerWorker.cs
@@ -0,0 +1,1361 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers;
+using Polycode.NostalgicPlayer.Kit;
+using Polycode.NostalgicPlayer.Kit.Bases;
+using Polycode.NostalgicPlayer.Kit.Containers;
+using Polycode.NostalgicPlayer.Kit.Interfaces;
+using Polycode.NostalgicPlayer.Kit.Streams;
+
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker
+{
+	/// <summary>
+	/// Main worker class
+	/// </summary>
+	internal class PumaTrackerWorker : ModulePlayerWithPositionDurationAgentBase
+	{
+		private string songName;
+		private Position[] positions;
+		private Track[][] tracks;
+		private Instrument[] instruments;
+		private byte[][] samples;
+
+		private byte[][] allSamples;
+
+		private GlobalPlayingInfo playingInfo;
+		private VoiceInfo[] voices;
+
+		private const int InfoPositionLine = 4;
+		private const int InfoTrackLine = 5;
+		private const int InfoSpeedLine = 6;
+
+		#region IPlayerAgent implementation
+		/********************************************************************/
+		/// <summary>
+		/// Returns the file extensions that identify this player
+		/// </summary>
+		/********************************************************************/
+		public override string[] FileExtensions => [ "puma" ];
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Test the file to see if it could be identified
+		/// </summary>
+		/********************************************************************/
+		public override AgentResult Identify(PlayerFileInfo fileInfo)
+		{
+			ModuleStream moduleStream = fileInfo.ModuleStream;
+
+			// Check the module size
+			if (moduleStream.Length < 80)
+				return AgentResult.Unknown;
+
+			// Find the first track and check the mark
+			moduleStream.Seek(12, SeekOrigin.Begin);
+
+			ushort numberOfTracks = moduleStream.Read_B_UINT16();
+			int offset = (numberOfTracks + 1) * 14 + 80;
+
+			if (offset >= moduleStream.Length)
+				return AgentResult.Unknown;
+
+			moduleStream.Seek(offset, SeekOrigin.Begin);
+
+			if (moduleStream.Read_B_UINT32() == 0x70617474)		// patt
+				return AgentResult.Ok;
+
+			return AgentResult.Unknown;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Return the name of the module
+		/// </summary>
+		/********************************************************************/
+		public override string ModuleName => songName;
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Returns the description and value on the line given. If the line
+		/// is out of range, false is returned
+		/// </summary>
+		/********************************************************************/
+		public override bool GetInformationString(int line, out string description, out string value)
+		{
+			// Find out which line to take
+			switch (line)
+			{
+				// Number of positions
+				case 0:
+				{
+					description = Resources.IDS_PUMA_INFODESCLINE0;
+					value = positions.Length.ToString();
+					break;
+				}
+
+				// Used tracks
+				case 1:
+				{
+					description = Resources.IDS_PUMA_INFODESCLINE1;
+					value = tracks.Length.ToString();
+					break;
+				}
+
+				// Used instruments
+				case 2:
+				{
+					description = Resources.IDS_PUMA_INFODESCLINE2;
+					value = instruments.Length.ToString();
+					break;
+				}
+
+				// Supported / used samples
+				case 3:
+				{
+					description = Resources.IDS_PUMA_INFODESCLINE3;
+					value = "10";
+					break;
+				}
+
+				// Playing position
+				case 4:
+				{
+					description = Resources.IDS_PUMA_INFODESCLINE4;
+					value = FormatPosition();
+					break;
+				}
+
+				// Playing tracks
+				case 5:
+				{
+					description = Resources.IDS_PUMA_INFODESCLINE5;
+					value = FormatTracks();
+					break;
+				}
+
+				// Current speed
+				case 6:
+				{
+					description = Resources.IDS_PUMA_INFODESCLINE6;
+					value = FormatSpeed();
+					break;
+				}
+
+				default:
+				{
+					description = null;
+					value = null;
+
+					return false;
+				}
+			}
+
+			return true;
+		}
+		#endregion
+
+		#region IModulePlayerAgent implementation
+		/********************************************************************/
+		/// <summary>
+		/// Will load the file into memory
+		/// </summary>
+		/********************************************************************/
+		public override AgentResult Load(PlayerFileInfo fileInfo, out string errorMessage)
+		{
+			errorMessage = string.Empty;
+
+			try
+			{
+				byte[] buf = new byte[13];
+
+				ModuleStream moduleStream = fileInfo.ModuleStream;
+				Encoding encoder = EncoderCollection.Amiga;
+
+				// Read the song name
+				buf[12] = 0x00;
+				moduleStream.ReadInto(buf, 0, 12);
+
+				songName = encoder.GetString(buf);
+
+				// Read different counts
+				int numberOfPositions = moduleStream.Read_B_UINT16() + 1;
+				int numberOfTracks = moduleStream.Read_B_UINT16();
+				int numberOfInstruments = moduleStream.Read_B_UINT16();
+
+				if (moduleStream.EndOfStream)
+				{
+					errorMessage = Resources.IDS_PUMA_ERR_LOADING_HEADER;
+					return AgentResult.Error;
+				}
+
+				moduleStream.Seek(2, SeekOrigin.Current);
+
+				uint[] sampleDataOffsets = new uint[10];
+				ushort[] sampleLengths = new ushort[10];
+
+				moduleStream.ReadArray_B_UINT32s(sampleDataOffsets, 0, 10);
+				moduleStream.ReadArray_B_UINT16s(sampleLengths, 0, 10);
+
+				if (moduleStream.EndOfStream)
+				{
+					errorMessage = Resources.IDS_PUMA_ERR_LOADING_HEADER;
+					return AgentResult.Error;
+				}
+
+				if (!LoadPositionList(moduleStream, numberOfPositions))
+				{
+					errorMessage = Resources.IDS_PUMA_ERR_LOADING_POSITION_LIST;
+					return AgentResult.Error;
+				}
+
+				if (!LoadTracks(moduleStream, numberOfTracks))
+				{
+					errorMessage = Resources.IDS_PUMA_ERR_LOADING_TRACKS;
+					return AgentResult.Error;
+				}
+
+				if (!LoadInstruments(moduleStream, numberOfInstruments))
+				{
+					errorMessage = Resources.IDS_PUMA_ERR_LOADING_INSTRUMENTINFO;
+					return AgentResult.Error;
+				}
+
+				if (!LoadSampleData(moduleStream, sampleDataOffsets, sampleLengths))
+				{
+					errorMessage = Resources.IDS_PUMA_ERR_LOADING_SAMPLES;
+					return AgentResult.Error;
+				}
+			}
+			catch (Exception)
+			{
+				Cleanup();
+				throw;
+			}
+
+			// Everything is loaded alright
+			return AgentResult.Ok;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Initializes the player
+		/// </summary>
+		/********************************************************************/
+		public override bool InitPlayer(out string errorMessage)
+		{
+			if (!base.InitPlayer(out errorMessage))
+				return false;
+
+			BuildSampleList();
+
+			return true;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Cleanup the player
+		/// </summary>
+		/********************************************************************/
+		public override void CleanupPlayer()
+		{
+			Cleanup();
+
+			base.CleanupPlayer();
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Initializes the current song
+		/// </summary>
+		/********************************************************************/
+		public override bool InitSound(int songNumber, out string errorMessage)
+		{
+			if (!base.InitSound(songNumber, out errorMessage))
+				return false;
+
+			InitializeSound();
+
+			return true;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// This is the main player method
+		/// </summary>
+		/********************************************************************/
+		public override void Play()
+		{
+			if (playingInfo.CurrentRowNumber == 32)
+			{
+				playingInfo.CurrentPosition++;
+
+				if (playingInfo.CurrentPosition == positions.Length)
+					playingInfo.CurrentPosition = 0;
+
+				GetNextPosition();
+
+				ShowPosition();
+				ShowTracks();
+
+				if (HasPositionBeenVisited(playingInfo.CurrentPosition))
+					OnEndReached(playingInfo.CurrentPosition);
+
+				MarkPositionAsVisited(playingInfo.CurrentPosition);
+			}
+
+			playingInfo.SpeedCounter--;
+
+			if (playingInfo.SpeedCounter == 0)
+			{
+				playingInfo.CurrentRowNumber++;
+				playingInfo.SpeedCounter = playingInfo.CurrentSpeed;
+
+				for (int i = 0; i < 4; i++)
+				{
+					VoiceInfo voiceInfo = voices[i];
+
+					voiceInfo.RowCounter--;
+
+					if (voiceInfo.RowCounter == 0)
+					{
+						voiceInfo.TrackPosition++;
+
+						GetNextTrackInfo(voiceInfo, VirtualChannels[i]);
+					}
+				}
+			}
+
+			for (int i = 0; i < 4; i++)
+			{
+				VoiceInfo voiceInfo = voices[i];
+
+				if (voiceInfo.VoiceFlag.HasFlag(VoiceFlag.VoiceRunning))
+					EffectHandler(voiceInfo, VirtualChannels[i]);
+			}
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Returns all the samples available in the module. If none, null
+		/// is returned
+		/// </summary>
+		/********************************************************************/
+		public override IEnumerable<SampleInfo> Samples
+		{
+			get
+			{
+				// Build frequency table
+				uint[] frequencies = new uint[10 * 12];
+
+				for (int j = 0; j < 6 * 12; j++)
+					frequencies[1 * 12 + j] = 3546895U / Tables.Periods[1 + j];
+
+				for (int i = 0; i < 10; i++)
+				{
+					SampleInfo sampleInfo = new SampleInfo
+					{
+						Name = string.Empty,
+						Type = SampleInfo.SampleType.Sample,
+						Flags = SampleInfo.SampleFlag.None,
+						Volume = 256,
+						Panning = -1,
+						Sample = samples[i],
+						Length = samples[i] != null ? (uint)samples[i].Length : 0,
+						LoopStart = 0,
+						LoopLength = 0,
+						NoteFrequencies = frequencies
+					};
+
+					yield return sampleInfo;
+				}
+
+				for (int i = 0; i < Tables.Waveforms.Length; i++)
+				{
+					SampleInfo sampleInfo = new SampleInfo
+					{
+						Name = string.Empty,
+						Type = SampleInfo.SampleType.Synthesis,
+						Flags = SampleInfo.SampleFlag.None,
+						Volume = 256,
+						Panning = -1,
+						Sample = null,
+						Length = 0,
+						LoopStart = 0,
+						LoopLength = 0,
+						NoteFrequencies = frequencies
+					};
+
+					yield return sampleInfo;
+				}
+			}
+		}
+		#endregion
+
+		#region ModulePlayerWithPositionDurationAgentBase implementation
+		/********************************************************************/
+		/// <summary>
+		/// Initialize all internal structures when beginning duration
+		/// calculation on a new sub-song
+		/// </summary>
+		/********************************************************************/
+		protected override int InitDuration(int songNumber, int startPosition)
+		{
+			InitializeSound();
+
+			return startPosition;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Return the total number of positions
+		/// </summary>
+		/********************************************************************/
+		protected override int GetTotalNumberOfPositions()
+		{
+			return positions.Length;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Create a snapshot of all the internal structures and return it
+		/// </summary>
+		/********************************************************************/
+		protected override ISnapshot CreateSnapshot()
+		{
+			return new Snapshot(playingInfo, voices);
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Initialize internal structures based on the snapshot given
+		/// </summary>
+		/********************************************************************/
+		protected override bool SetSnapshot(ISnapshot snapshot, out string errorMessage)
+		{
+			errorMessage = string.Empty;
+
+			// Start to make a clone of the snapshot
+			Snapshot currentSnapshot = (Snapshot)snapshot;
+			Snapshot clonedSnapshot = new Snapshot(currentSnapshot.PlayingInfo, currentSnapshot.Voices);
+
+			playingInfo = clonedSnapshot.PlayingInfo;
+			voices = clonedSnapshot.Voices;
+
+			UpdateModuleInformation();
+
+			return true;
+		}
+		#endregion
+
+		#region Private methods
+		/********************************************************************/
+		/// <summary>
+		/// Load the position list
+		/// </summary>
+		/********************************************************************/
+		private bool LoadPositionList(ModuleStream moduleStream, int numberOfPositions)
+		{
+			positions = new Position[numberOfPositions];
+
+			for (int i = 0; i < numberOfPositions; i++)
+			{
+				Position position = new Position();
+
+				for (int j = 0; j < 4; j++)
+				{
+					VoicePosition voicePosition = new VoicePosition();
+
+					voicePosition.TrackNumber = moduleStream.Read_UINT8();
+					voicePosition.InstrumentTranspose = moduleStream.Read_INT8();
+					voicePosition.NoteTranspose = moduleStream.Read_INT8();
+
+					position.VoicePosition[j] = voicePosition;
+				}
+
+				position.Speed = moduleStream.Read_UINT8();
+
+				if (moduleStream.EndOfStream)
+					return false;
+
+				moduleStream.Seek(1, SeekOrigin.Current);
+
+				positions[i] = position;
+			}
+
+			return true;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Load all the tracks
+		/// </summary>
+		/********************************************************************/
+		private bool LoadTracks(ModuleStream moduleStream, int numberOfTracks)
+		{
+			tracks = new Track[numberOfTracks][];
+
+			for (int i = 0; i < numberOfTracks; i++)
+			{
+				// Check mark
+				if (moduleStream.Read_B_UINT32() != 0x70617474)     // patt
+					return false;
+
+				Track[] track = LoadSingleTrack(moduleStream);
+				if (track == null)
+					return false;
+
+				tracks[i] = track;
+			}
+
+			// Check for extra mark
+			if (moduleStream.Read_B_UINT32() != 0x70617474)     // patt
+				return false;
+
+			return true;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Load a single track
+		/// </summary>
+		/********************************************************************/
+		private Track[] LoadSingleTrack(ModuleStream moduleStream)
+		{
+			List<Track> track = new List<Track>();
+
+			for (int row = 0; row < 32;)
+			{
+				byte byt1 = moduleStream.Read_UINT8();
+				byte byt2 = moduleStream.Read_UINT8();
+				byte byt3 = moduleStream.Read_UINT8();
+				byte byt4 = moduleStream.Read_UINT8();
+
+				if (moduleStream.EndOfStream)
+					return null;
+
+				track.Add(new Track
+				{
+					Note = byt1,
+					Instrument = (byte)(byt2 & 0x1f),
+					Effect = (TrackEffect)((byt2 & 0xe0) >> 5),
+					EffectArgument = byt3,
+					RowsToWait = byt4
+				});
+
+				row += byt4;
+			}
+
+			return track.ToArray();
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Load all the instruments
+		/// </summary>
+		/********************************************************************/
+		private bool LoadInstruments(ModuleStream moduleStream, int numberOfInstruments)
+		{
+			instruments = new Instrument[numberOfInstruments];
+
+			for (int i = 0; i < numberOfInstruments; i++)
+			{
+				Instrument instr = new Instrument();
+
+				if (moduleStream.Read_B_UINT32() != 0x696e7374)     // inst
+					return false;
+
+				instr.VolumeCommands = LoadCommands(moduleStream);
+				if (instr.VolumeCommands == null)
+					return false;
+
+				if (moduleStream.Read_B_UINT32() != 0x696e7366)     // insf
+					return false;
+
+				instr.FrequencyCommands = LoadCommands(moduleStream);
+				if (instr.FrequencyCommands == null)
+					return false;
+
+				instruments[i] = instr;
+			}
+
+			// Check for extra mark, but only if there are samples
+			if ((moduleStream.Position < moduleStream.Length) && (moduleStream.Read_B_UINT32() != 0x696e7374))     // inst
+				return false;
+
+			return true;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Load commands for an instrument
+		/// </summary>
+		/********************************************************************/
+		private InstrumentCommand[] LoadCommands(ModuleStream moduleStream)
+		{
+			List<InstrumentCommand> commands = new List<InstrumentCommand>();
+
+			for (;;)
+			{
+				InstrumentCommand cmd = new InstrumentCommand
+				{
+					Command = moduleStream.Read_UINT8(),
+					Argument1 = moduleStream.Read_UINT8(),
+					Argument2 = moduleStream.Read_UINT8(),
+					Argument3 = moduleStream.Read_UINT8()
+				};
+
+				if (moduleStream.EndOfStream)
+					return null;
+
+				// Vimto does not have an end mark for some instruments, so check if reached a new instrument
+				if ((cmd.Command == 'i') && (cmd.Argument1 == 'n') && (cmd.Argument2  == 's') && (cmd.Argument3 == 't'))
+				{
+					cmd = new InstrumentCommand
+					{
+						Command = 0xe0,
+						Argument1 = 0,
+						Argument2 = 0,
+						Argument3 = 0
+					};
+
+					moduleStream.Seek(-4, SeekOrigin.Current);
+				}
+
+				commands.Add(cmd);
+
+				if ((cmd.Command == 0xe0) || (cmd.Command == 0xb0))
+					break;
+			}
+
+			return commands.ToArray();
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Load all the samples
+		/// </summary>
+		/********************************************************************/
+		private bool LoadSampleData(ModuleStream moduleStream, uint[] sampleDataOffsets, ushort[] sampleLengths)
+		{
+			samples = new byte[10][];
+
+			for (int i = 0; i < 10; i++)
+			{
+				if (sampleLengths[i] != 0)
+				{
+					moduleStream.Seek(sampleDataOffsets[i], SeekOrigin.Begin);
+
+					// Because of a bug, the sample length is one word too many
+					int length = (sampleLengths[i] - 1) * 2;
+
+					// Read the samples as unsigned, even when they are signed.
+					// This is because the waveforms in Tables as unsigned as
+					// this format is more read friendly
+					using (ModuleStream sampleStream = moduleStream.GetSampleDataStream(i, length))
+					{
+						samples[i] = new byte[length];
+
+						int readBytes = sampleStream.Read(samples[i], 0, length);
+						if (readBytes < (length - 8))
+							return false;
+					}
+				}
+			}
+
+			return true;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Build list with all the samples and waveforms
+		/// </summary>
+		/********************************************************************/
+		private void BuildSampleList()
+		{
+			allSamples = new byte[10 + Tables.Waveforms.Length][];
+
+			for (int i = 0; i < 10; i++)
+				allSamples[i] = samples[i];
+
+			for (int i = 0; i < Tables.Waveforms.Length; i++)
+				allSamples[10 + i] = Tables.Waveforms[i];
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Initialize sound structures
+		/// </summary>
+		/********************************************************************/
+		private void InitializeSound()
+		{
+			playingInfo = new GlobalPlayingInfo
+			{
+				CurrentSpeed = 3,
+				SpeedCounter = 3,
+				CurrentPosition = -1,
+				CurrentRowNumber = 32
+			};
+
+			voices = new VoiceInfo[4];
+
+			for (int i = 0; i < 4; i++)
+			{
+				voices[i] = new VoiceInfo
+				{
+					Track = null,
+					TrackPosition = 0,
+
+					RowCounter = 1,
+
+					VolumeCommands = null,
+					VolumeCommandPosition = 0,
+
+					FrequencyCommands = null,
+					FrequencyCommandPosition = 0,
+
+					InstrumentTranspose = 0,
+					NoteTranspose = 0,
+					TransposedNote = 0,
+
+					SampleData = null,
+					SampleLength = 0,
+					SampleNumber = 0,
+
+					Period = 0,
+					Volume = 0,
+
+					PortamentoAddValue = 0,
+
+					VoiceFlag = VoiceFlag.None,
+
+					VolumeSlideCounter = 0,
+					VolumeSlideRemainingTime = 0,
+					VolumeSlideDelta = 0,
+					VolumeSlideDirection = 0,
+					VolumeSlideValue = 0,
+
+					FrequencyCounter = 0,
+					FrequencyVaryAddValue = 0,
+					FrequencyVaryValue = 0,
+
+					WaveformChangeCounter = 0,
+					WaveformAddValue = 0,
+					WaveformValue = 0
+				};
+			}
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Frees all the memory the player have allocated
+		/// </summary>
+		/********************************************************************/
+		private void Cleanup()
+		{
+			songName = null;
+			positions = null;
+			tracks = null;
+			instruments = null;
+			samples = null;
+
+			allSamples = null;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will get the next position for all tracks
+		/// </summary>
+		/********************************************************************/
+		private void GetNextPosition()
+		{
+			playingInfo.CurrentRowNumber = 0;
+
+			Position position = positions[playingInfo.CurrentPosition];
+
+			for (int i = 0; i < 4; i++)
+			{
+				VoiceInfo voiceInfo = voices[i];
+
+				VoicePosition voicePosition = position.VoicePosition[i];
+				byte trackNumber = voicePosition.TrackNumber;
+				voiceInfo.Track = trackNumber >= tracks.Length ? Tables.EmptyTrack : tracks[trackNumber];
+				voiceInfo.TrackPosition = -1;
+
+				voiceInfo.InstrumentTranspose = voicePosition.InstrumentTranspose;
+				voiceInfo.NoteTranspose = voicePosition.NoteTranspose;
+				voiceInfo.RowCounter = 1;
+			}
+
+			if (position.Speed != 0)
+			{
+				playingInfo.CurrentSpeed = position.Speed;
+				ShowSpeed();
+			}
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will parse the next track bytes for the given voice
+		/// </summary>
+		/********************************************************************/
+		private void GetNextTrackInfo(VoiceInfo voiceInfo, IChannel channel)
+		{
+			Track track = voiceInfo.Track[voiceInfo.TrackPosition];
+
+			byte note = track.Note;
+			if (note != 0)
+			{
+				channel.Mute();
+
+				voiceInfo.TransposedNote = (byte)(note + voiceInfo.NoteTranspose);
+
+				int instrNumber = track.Instrument + voiceInfo.InstrumentTranspose;
+				Instrument instr = instrNumber == 0 ? Tables.EmptyInstrument : instruments[track.Instrument + voiceInfo.InstrumentTranspose - 1];
+
+				voiceInfo.VolumeCommands = instr.VolumeCommands;
+				voiceInfo.FrequencyCommands = instr.FrequencyCommands;
+
+				voiceInfo.VoiceFlag = VoiceFlag.SetVolumeSlide | VoiceFlag.SetFrequency | VoiceFlag.VoiceRunning;
+				voiceInfo.VolumeCommandPosition = 0;
+				voiceInfo.FrequencyCommandPosition = 0;
+			}
+
+			voiceInfo.RowCounter = track.RowsToWait;
+
+			switch (track.Effect)
+			{
+				case TrackEffect.None:
+				{
+					voiceInfo.Volume = 64;
+					voiceInfo.PortamentoAddValue = 0;
+					break;
+				}
+
+				case TrackEffect.SetVolume:
+				{
+					voiceInfo.Volume = track.EffectArgument;
+					voiceInfo.PortamentoAddValue = 0;
+					break;
+				}
+
+				case TrackEffect.PortamentoDown:
+				{
+					voiceInfo.Volume = 64;
+					voiceInfo.PortamentoAddValue = track.EffectArgument;
+					break;
+				}
+
+				case TrackEffect.PortamentoUp:
+				{
+					voiceInfo.Volume = 64;
+					voiceInfo.PortamentoAddValue = (short)(-track.EffectArgument);
+					break;
+				}
+			}
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will run instrument commands and do all real time effects
+		/// </summary>
+		/********************************************************************/
+		private void EffectHandler(VoiceInfo voiceInfo, IChannel channel)
+		{
+			DoInstrumentVolumeCommands(voiceInfo);
+			DoInstrumentFrequencyCommands(voiceInfo);
+			SetupHardware(voiceInfo, channel);
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will parse the instrument volume commands
+		/// </summary>
+		/********************************************************************/
+		private void DoInstrumentVolumeCommands(VoiceInfo voiceInfo)
+		{
+			bool oneMore;
+
+			do
+			{
+				oneMore = false;
+
+				InstrumentCommand command = voiceInfo.VolumeCommands[voiceInfo.VolumeCommandPosition];
+
+				switch (command.Command)
+				{
+					// Volume slide
+					case 0xa0:
+					{
+						oneMore = DoInstrumentVolumeSlide(command, voiceInfo);
+						break;
+					}
+
+					// Set sample
+					case 0xc0:
+					{
+						DoInstrumentSetSample(command, voiceInfo);
+						oneMore = true;
+						break;
+					}
+
+					// Goto
+					case 0xb0:
+					{
+						voiceInfo.VolumeCommandPosition = (byte)(command.Argument1 / 4);
+						oneMore = true;
+						break;
+					}
+
+					// End
+					default:
+					{
+						voiceInfo.VolumeSlideValue = 0;
+						voiceInfo.VoiceFlag &= ~VoiceFlag.VoiceRunning;
+						break;
+					}
+				}
+			}
+			while (oneMore);
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will handle the volume slide command
+		/// </summary>
+		/********************************************************************/
+		private bool DoInstrumentVolumeSlide(InstrumentCommand command, VoiceInfo voiceInfo)
+		{
+			bool hasFlag = voiceInfo.VoiceFlag.HasFlag(VoiceFlag.SetVolumeSlide);
+			voiceInfo.VoiceFlag &= ~VoiceFlag.SetVolumeSlide;
+
+			if (hasFlag)
+			{
+				byte volumeBegin = command.Argument1;
+				byte volumeEnd = command.Argument2;
+
+				voiceInfo.VolumeSlideCounter = (byte)(command.Argument3 + 1);
+				voiceInfo.VolumeSlideValue = volumeBegin;
+				voiceInfo.VolumeSlideRemainingTime = 0;
+				voiceInfo.VolumeSlideDirection = 1;
+
+				int delta = volumeEnd - volumeBegin;
+				if (delta < 0)
+				{
+					delta = -delta;
+					voiceInfo.VolumeSlideDirection = -1;
+				}
+
+				voiceInfo.VolumeSlideDelta = (sbyte)delta;
+			}
+			else
+			{
+				voiceInfo.VolumeSlideCounter--;
+
+				if (voiceInfo.VolumeSlideCounter == 0)
+				{
+					voiceInfo.VolumeCommandPosition++;
+					voiceInfo.VoiceFlag |= VoiceFlag.SetVolumeSlide;
+
+					return true;
+				}
+
+				byte time = command.Argument3;
+				int timeCount = (voiceInfo.VolumeSlideRemainingTime + voiceInfo.VolumeSlideDelta) - time;
+
+				if (timeCount >= 0)
+				{
+					short valueToAdd = 0;
+
+					do
+					{
+						valueToAdd += voiceInfo.VolumeSlideDirection;
+						timeCount -= time;
+					}
+					while (timeCount >= 0);
+
+					voiceInfo.VolumeSlideValue += valueToAdd;
+				}
+
+				timeCount += time;
+				voiceInfo.VolumeSlideRemainingTime = (byte)timeCount;
+			}
+
+			return false;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will handle the set sample command
+		/// </summary>
+		/********************************************************************/
+		private void DoInstrumentSetSample(InstrumentCommand command, VoiceInfo voiceInfo)
+		{
+			byte sampleNumber = command.Argument1;
+
+			voiceInfo.WaveformAddValue = (sbyte)command.Argument2;
+			voiceInfo.WaveformValue = (sbyte)command.Argument2;
+			voiceInfo.WaveformChangeCounter = command.Argument3;
+
+			byte[] sampleData = allSamples[sampleNumber];
+
+			ushort sampleLength = (ushort)(sampleData?.Length ?? 0);
+			voiceInfo.SampleLength = sampleLength;
+
+			if (sampleLength >= 80 * 2)
+				voiceInfo.VoiceFlag |= VoiceFlag.NoLoop;
+
+			voiceInfo.SampleData = sampleData;
+			voiceInfo.SampleNumber = sampleNumber;
+
+			voiceInfo.VolumeCommandPosition++;
+			voiceInfo.VoiceFlag |= VoiceFlag.SetVolumeSlide;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will parse the instrument frequency commands
+		/// </summary>
+		/********************************************************************/
+		private void DoInstrumentFrequencyCommands(VoiceInfo voiceInfo)
+		{
+			bool oneMore;
+
+			do
+			{
+				oneMore = false;
+
+				InstrumentCommand command = voiceInfo.FrequencyCommands[voiceInfo.FrequencyCommandPosition];
+
+				switch (command.Command)
+				{
+					// Very
+					case 0xa0:
+					{
+						oneMore = DoInstrumentVaryFrequency(command, voiceInfo);
+						break;
+					}
+
+					// Constant
+					case 0xd0:
+					{
+						oneMore = DoInstrumentConstantFrequency(command, voiceInfo);
+						break;
+					}
+
+					// Goto
+					case 0xb0:
+					{
+						voiceInfo.FrequencyCommandPosition = (byte)(command.Argument1 / 4);
+						oneMore = true;
+						break;
+					}
+				}
+			}
+			while (oneMore);
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will handle the frequency vary command
+		/// </summary>
+		/********************************************************************/
+		private bool DoInstrumentVaryFrequency(InstrumentCommand command, VoiceInfo voiceInfo)
+		{
+			bool hasFlag = voiceInfo.VoiceFlag.HasFlag(VoiceFlag.SetFrequency);
+			voiceInfo.VoiceFlag &= ~VoiceFlag.SetFrequency;
+
+			if (hasFlag)
+			{
+				short beginAdd = (sbyte)command.Argument1;
+				short endAdd = (sbyte)command.Argument2;
+
+				voiceInfo.FrequencyCounter = command.Argument3;
+
+				ushort period = Tables.Periods[voiceInfo.TransposedNote / 2];
+				beginAdd += (short)period;
+				endAdd += (short)period;
+
+				voiceInfo.Period = (ushort)beginAdd;
+				voiceInfo.FrequencyVaryValue = beginAdd << 16;
+
+				short delta = (short)(endAdd - beginAdd);
+				int addValue = delta * 256 / voiceInfo.FrequencyCounter;
+
+				if (addValue < 65536)
+					voiceInfo.FrequencyVaryAddValue = addValue << 8;
+				else
+				{
+					addValue = delta / voiceInfo.FrequencyCounter;
+					voiceInfo.FrequencyVaryAddValue = addValue << 16;
+				}
+			}
+			else
+			{
+				voiceInfo.FrequencyCounter--;
+
+				if (voiceInfo.FrequencyCounter == 0)
+				{
+					voiceInfo.FrequencyCommandPosition++;
+					voiceInfo.VoiceFlag |= VoiceFlag.SetFrequency;
+
+					return true;
+				}
+
+				voiceInfo.FrequencyVaryValue += voiceInfo.FrequencyVaryAddValue;
+				voiceInfo.Period = (ushort)(voiceInfo.FrequencyVaryValue >> 16);
+			}
+
+			return false;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will handle the frequency constant command
+		/// </summary>
+		/********************************************************************/
+		private bool DoInstrumentConstantFrequency(InstrumentCommand command, VoiceInfo voiceInfo)
+		{
+			bool hasFlag = voiceInfo.VoiceFlag.HasFlag(VoiceFlag.SetFrequency);
+			voiceInfo.VoiceFlag &= ~VoiceFlag.SetFrequency;
+
+			if (hasFlag)
+			{
+				voiceInfo.FrequencyCounter = command.Argument3;
+
+				int index = ((sbyte)command.Argument1 + voiceInfo.TransposedNote) / 2;
+				index = Math.Min(index, Tables.Periods.Length - 1);
+				voiceInfo.Period = Tables.Periods[index];
+			}
+			else
+			{
+				voiceInfo.FrequencyCounter--;
+
+				if (voiceInfo.FrequencyCounter == 0)
+				{
+					voiceInfo.VoiceFlag |= VoiceFlag.SetFrequency;
+					voiceInfo.FrequencyCommandPosition++;
+
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will tell NostalgicPlayer what to play
+		/// </summary>
+		/********************************************************************/
+		private void SetupHardware(VoiceInfo voiceInfo, IChannel channel)
+		{
+			voiceInfo.Period = (ushort)(voiceInfo.Period + voiceInfo.PortamentoAddValue);
+
+			byte[] sampleData = voiceInfo.SampleData;
+
+			if (voiceInfo.WaveformAddValue != 0)
+			{
+				if ((voiceInfo.WaveformValue <= 0) || (voiceInfo.WaveformValue >= voiceInfo.WaveformChangeCounter))
+					voiceInfo.WaveformAddValue = (sbyte)-voiceInfo.WaveformAddValue;
+
+				voiceInfo.WaveformValue = (sbyte)(voiceInfo.WaveformValue + voiceInfo.WaveformAddValue);
+
+				sampleData = allSamples[voiceInfo.SampleNumber + voiceInfo.WaveformValue];
+			}
+
+			if (sampleData != null)
+			{
+				if (voiceInfo.SampleLength > 2)
+				{
+					channel.SetSample(sampleData, 0, voiceInfo.SampleLength);
+					channel.SetSampleNumber(voiceInfo.SampleNumber);
+
+					bool hasFlag = voiceInfo.VoiceFlag.HasFlag(VoiceFlag.NoLoop);
+					voiceInfo.VoiceFlag &= ~VoiceFlag.NoLoop;
+
+					if (!hasFlag && (voiceInfo.SampleLength > 2))
+						channel.SetLoop(0, voiceInfo.SampleLength);
+					else
+						voiceInfo.SampleLength = 2;
+				}
+
+				channel.SetAmigaPeriod(voiceInfo.Period);
+
+				int volume = voiceInfo.VolumeSlideValue + voiceInfo.Volume - 64;
+				if (volume < 0)
+					volume = 0;
+
+				channel.SetAmigaVolume((ushort)volume);
+			}
+			else
+				channel.Mute();
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will update the module information with current position
+		/// </summary>
+		/********************************************************************/
+		private void ShowPosition()
+		{
+			OnModuleInfoChanged(InfoPositionLine, FormatPosition());
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will update the module information with track numbers
+		/// </summary>
+		/********************************************************************/
+		private void ShowTracks()
+		{
+			OnModuleInfoChanged(InfoTrackLine, FormatTracks());
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will update the module information with current speed
+		/// </summary>
+		/********************************************************************/
+		private void ShowSpeed()
+		{
+			OnModuleInfoChanged(InfoSpeedLine, FormatSpeed());
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Will update the module information with all dynamic values
+		/// </summary>
+		/********************************************************************/
+		private void UpdateModuleInformation()
+		{
+			ShowPosition();
+			ShowTracks();
+			ShowSpeed();
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Return a string containing the playing position
+		/// </summary>
+		/********************************************************************/
+		private string FormatPosition()
+		{
+			if (playingInfo.CurrentPosition < 0)
+				return "0";
+
+			return playingInfo.CurrentPosition.ToString();
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Return a string containing the playing tracks
+		/// </summary>
+		/********************************************************************/
+		private string FormatTracks()
+		{
+			StringBuilder sb = new StringBuilder();
+
+			for (int i = 0; i < 4; i++)
+			{
+				byte trackNumber = playingInfo.CurrentPosition < 0 ? (byte)0 : positions[playingInfo.CurrentPosition].VoicePosition[i].TrackNumber;
+				sb.Append(trackNumber);
+
+				sb.Append(", ");
+			}
+
+			sb.Remove(sb.Length - 2, 2);
+
+			return sb.ToString();
+		}
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Return a string containing the current speed
+		/// </summary>
+		/********************************************************************/
+		private string FormatSpeed()
+		{
+			return playingInfo.CurrentSpeed.ToString();
+		}
+		#endregion
+	}
+}
diff --git a/Source/Agents/Players/PumaTracker/Resources.Designer.cs b/Source/Agents/Players/PumaTracker/Resources.Designer.cs
new file mode 100644
index 00000000..4a82bc21
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Resources.Designer.cs
@@ -0,0 +1,213 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Original player by Ocean France from the game Toki.
+        ///Converted to C# by Thomas Neumann.
+        ///
+        ///The original player was ripped from the game Toki and then optimized by Flyspy/Agile. Agile then created an editor based on the replay routine. This player can play those modules..
+        /// </summary>
+        internal static string IDS_PUMA_DESCRIPTION {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_DESCRIPTION", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Original player by Ocean France from the game Toki.
+        ///Converted to C# by Thomas Neumann.
+        ///
+        ///The original player was ripped from the game Toki and then optimized by Flyspy/Agile. Agile then created an editor based on the replay routine. This player can play those modules..
+        /// </summary>
+        internal static string IDS_PUMA_DESCRIPTION_AGENT1 {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_DESCRIPTION_AGENT1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Can&apos;t read the module header.
+        /// </summary>
+        internal static string IDS_PUMA_ERR_LOADING_HEADER {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_ERR_LOADING_HEADER", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Can&apos;t read instrument information.
+        /// </summary>
+        internal static string IDS_PUMA_ERR_LOADING_INSTRUMENTINFO {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_ERR_LOADING_INSTRUMENTINFO", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Can&apos;t read position list.
+        /// </summary>
+        internal static string IDS_PUMA_ERR_LOADING_POSITION_LIST {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_ERR_LOADING_POSITION_LIST", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Can&apos;t read the module samples.
+        /// </summary>
+        internal static string IDS_PUMA_ERR_LOADING_SAMPLES {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_ERR_LOADING_SAMPLES", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Can&apos;t read module tracks.
+        /// </summary>
+        internal static string IDS_PUMA_ERR_LOADING_TRACKS {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_ERR_LOADING_TRACKS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Number of positions:.
+        /// </summary>
+        internal static string IDS_PUMA_INFODESCLINE0 {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_INFODESCLINE0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Used tracks:.
+        /// </summary>
+        internal static string IDS_PUMA_INFODESCLINE1 {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_INFODESCLINE1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Used instruments:.
+        /// </summary>
+        internal static string IDS_PUMA_INFODESCLINE2 {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_INFODESCLINE2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Supported / used samples:.
+        /// </summary>
+        internal static string IDS_PUMA_INFODESCLINE3 {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_INFODESCLINE3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Playing position:.
+        /// </summary>
+        internal static string IDS_PUMA_INFODESCLINE4 {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_INFODESCLINE4", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Playing tracks:.
+        /// </summary>
+        internal static string IDS_PUMA_INFODESCLINE5 {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_INFODESCLINE5", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Current speed:.
+        /// </summary>
+        internal static string IDS_PUMA_INFODESCLINE6 {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_INFODESCLINE6", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to PumaTracker.
+        /// </summary>
+        internal static string IDS_PUMA_NAME {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_NAME", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to PumaTracker.
+        /// </summary>
+        internal static string IDS_PUMA_NAME_AGENT1 {
+            get {
+                return ResourceManager.GetString("IDS_PUMA_NAME_AGENT1", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Source/Agents/Players/PumaTracker/Resources.resx b/Source/Agents/Players/PumaTracker/Resources.resx
new file mode 100644
index 00000000..d7abe8ac
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Resources.resx
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="IDS_PUMA_DESCRIPTION" xml:space="preserve">
+    <value>Original player by Ocean France from the game Toki.
+Converted to C# by Thomas Neumann.
+
+The original player was ripped from the game Toki and then optimized by Flyspy/Agile. Agile then created an editor based on the replay routine. This player can play those modules.</value>
+  </data>
+  <data name="IDS_PUMA_DESCRIPTION_AGENT1" xml:space="preserve">
+    <value>Original player by Ocean France from the game Toki.
+Converted to C# by Thomas Neumann.
+
+The original player was ripped from the game Toki and then optimized by Flyspy/Agile. Agile then created an editor based on the replay routine. This player can play those modules.</value>
+  </data>
+  <data name="IDS_PUMA_ERR_LOADING_HEADER" xml:space="preserve">
+    <value>Can't read the module header</value>
+  </data>
+  <data name="IDS_PUMA_ERR_LOADING_INSTRUMENTINFO" xml:space="preserve">
+    <value>Can't read instrument information</value>
+  </data>
+  <data name="IDS_PUMA_ERR_LOADING_POSITION_LIST" xml:space="preserve">
+    <value>Can't read position list</value>
+  </data>
+  <data name="IDS_PUMA_ERR_LOADING_SAMPLES" xml:space="preserve">
+    <value>Can't read the module samples</value>
+  </data>
+  <data name="IDS_PUMA_ERR_LOADING_TRACKS" xml:space="preserve">
+    <value>Can't read module tracks</value>
+  </data>
+  <data name="IDS_PUMA_INFODESCLINE0" xml:space="preserve">
+    <value>Number of positions:</value>
+  </data>
+  <data name="IDS_PUMA_INFODESCLINE1" xml:space="preserve">
+    <value>Used tracks:</value>
+  </data>
+  <data name="IDS_PUMA_INFODESCLINE2" xml:space="preserve">
+    <value>Used instruments:</value>
+  </data>
+  <data name="IDS_PUMA_INFODESCLINE3" xml:space="preserve">
+    <value>Supported / used samples:</value>
+  </data>
+  <data name="IDS_PUMA_INFODESCLINE4" xml:space="preserve">
+    <value>Playing position:</value>
+  </data>
+  <data name="IDS_PUMA_INFODESCLINE5" xml:space="preserve">
+    <value>Playing tracks:</value>
+  </data>
+  <data name="IDS_PUMA_INFODESCLINE6" xml:space="preserve">
+    <value>Current speed:</value>
+  </data>
+  <data name="IDS_PUMA_NAME" xml:space="preserve">
+    <value>PumaTracker</value>
+  </data>
+  <data name="IDS_PUMA_NAME_AGENT1" xml:space="preserve">
+    <value>PumaTracker</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/Agents/Players/PumaTracker/Tables.cs b/Source/Agents/Players/PumaTracker/Tables.cs
new file mode 100644
index 00000000..5fabbcbe
--- /dev/null
+++ b/Source/Agents/Players/PumaTracker/Tables.cs
@@ -0,0 +1,322 @@
+/******************************************************************************/
+/* This source, or parts thereof, may be used in any software as long the     */
+/* license of NostalgicPlayer is keep. See the LICENSE file for more          */
+/* information.                                                               */
+/******************************************************************************/
+using Polycode.NostalgicPlayer.Agent.Player.PumaTracker.Containers;
+
+namespace Polycode.NostalgicPlayer.Agent.Player.PumaTracker
+{
+	/// <summary>
+	/// Different tables needed
+	/// </summary>
+	internal static class Tables
+	{
+		/********************************************************************/
+		/// <summary>
+		/// Periods
+		/// </summary>
+		/********************************************************************/
+		public static readonly ushort[] Periods =
+		[
+			0,
+			6848, 6464, 6096, 5760, 5424, 5120, 4832, 4560, 4304, 4064, 3840, 3624,
+			3424, 3232, 3048, 2880, 2712, 2560, 2416, 2280, 2152, 2032, 1920, 1812,
+			1712, 1616, 1524, 1440, 1356, 1280, 1208, 1140, 1076, 1016,  960,  906,
+			 856,  808,  762,  720,  678,  640,  604,  570,  538,  508,  480,  453,
+			 428,  404,  381,  360,  339,  320,  302,  285,  269,  254,  240,  226,
+			 214,  202,  190,  180,  170,  160,  151,  143,  135,  127,  120,  113
+		];
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Used for instrument 0
+		/// </summary>
+		/********************************************************************/
+		public static readonly Instrument EmptyInstrument = new Instrument();
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Empty track
+		/// </summary>
+		/********************************************************************/
+		public static readonly Track[] EmptyTrack =
+		[
+			new Track
+			{
+				Note = 0,
+				Instrument = 0,
+				Effect = TrackEffect.None,
+				EffectArgument = 0,
+				RowsToWait = 32
+			}
+		];
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Waveforms
+		/// </summary>
+		/********************************************************************/
+		public static readonly byte[][] Waveforms =
+		[
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0x3f, 0x37, 0x2f, 0x27, 0x1f, 0x17, 0x0f, 0x07,
+				0xff, 0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0x37, 0x2f, 0x27, 0x1f, 0x17, 0x0f, 0x07,
+				0xff, 0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0x2f, 0x27, 0x1f, 0x17, 0x0f, 0x07,
+				0xff, 0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0x27, 0x1f, 0x17, 0x0f, 0x07,
+				0xff, 0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0x1f, 0x17, 0x0f, 0x07,
+				0xff, 0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0xa0, 0x17, 0x0f, 0x07,
+				0xff, 0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0xa0, 0x98, 0x0f, 0x07,
+				0xff, 0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0xa0, 0x98, 0x90, 0x07,
+				0xff, 0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0xa0, 0x98, 0x90, 0x88,
+				0xff, 0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0xa0, 0x98, 0x90, 0x88,
+				0x80, 0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0xa0, 0x98, 0x90, 0x88,
+				0x80, 0x88, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0xa0, 0x98, 0x90, 0x88,
+				0x80, 0x88, 0x90, 0x17, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0xa0, 0x98, 0x90, 0x88,
+				0x80, 0x88, 0x90, 0x98, 0x1f, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0xa0, 0x98, 0x90, 0x88,
+				0x80, 0x88, 0x90, 0x98, 0xa0, 0x27, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0xa0, 0x98, 0x90, 0x88,
+				0x80, 0x88, 0x90, 0x98, 0xa0, 0xa8, 0x2f, 0x37
+			],
+			[
+				0xc0, 0xc0, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0xf8, 0xf0, 0xe8, 0xe0, 0xd8, 0xd0, 0xc8,
+				0xc0, 0xb8, 0xb0, 0xa8, 0xa0, 0x98, 0x90, 0x88,
+				0x80, 0x88, 0x90, 0x98, 0xa0, 0xa8, 0xb0, 0x37
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x7f, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+				0x81, 0x81, 0x81, 0x81, 0x81, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7f, 0x7f
+			],
+			[
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7f
+			],
+			[
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x80, 0x80, 0x80, 0x80, 0x80, 0x7f, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x80, 0x80, 0x80, 0x80, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x80, 0x80, 0x80, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x80, 0x80, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x80, 0x80, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+				0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f
+			],
+			[
+				0x80, 0x80, 0x90, 0x98, 0xa0, 0xa8, 0xb0, 0xb8,
+				0xc0, 0xc8, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+				0x00, 0x08, 0x10, 0x18, 0x20, 0x28, 0x30, 0x38,
+				0x40, 0x48, 0x50, 0x58, 0x60, 0x68, 0x70, 0x7f
+			],
+			[
+				0x80, 0x80, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0,
+				0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
+				0x45, 0x45, 0x79, 0x7d, 0x7a, 0x77, 0x70, 0x66,
+				0x61, 0x58, 0x53, 0x4d, 0x2c, 0x20, 0x18, 0x12
+			],
+			[
+				0x04, 0xdb, 0xd3, 0xcd, 0xc6, 0xbc, 0xb5, 0xae,
+				0xa8, 0xa3, 0x9d, 0x99, 0x93, 0x8e, 0x8b, 0x8a,
+				0x45, 0x45, 0x79, 0x7d, 0x7a, 0x77, 0x70, 0x66,
+				0x5b, 0x4b, 0x43, 0x37, 0x2c, 0x20, 0x18, 0x12
+			],
+			[
+				0x04, 0xf8, 0xe8, 0xdb, 0xcf, 0xc6, 0xbe, 0xb0,
+				0xa8, 0xa4, 0x9e, 0x9a, 0x95, 0x94, 0x8d, 0x83,
+				0x00, 0x00, 0x40, 0x60, 0x7f, 0x60, 0x40, 0x20,
+				0x00, 0xe0, 0xc0, 0xa0, 0x80, 0xa0, 0xc0, 0xe0
+			],
+			[
+				0x00, 0x00, 0x40, 0x60, 0x7f, 0x60, 0x40, 0x20,
+				0x00, 0xe0, 0xc0, 0xa0, 0x80, 0xa0, 0xc0, 0xe0,
+				0x80, 0x80, 0x90, 0x98, 0xa0, 0xa8, 0xb0, 0xb8,
+				0xc0, 0xc8, 0xd0, 0xd8, 0xe0, 0xe8, 0xf0, 0xf8
+			],
+			[
+				0x00, 0x08, 0x10, 0x18, 0x20, 0x28, 0x30, 0x38,
+				0x40, 0x48, 0x50, 0x58, 0x60, 0x68, 0x70, 0x7f,
+				0x80, 0x80, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0,
+				0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70
+			],
+		];
+	}
+}
diff --git a/Source/Clients/NostalgicPlayer/NostalgicPlayer.csproj b/Source/Clients/NostalgicPlayer/NostalgicPlayer.csproj
index 5c4da915..1c9e1af8 100644
--- a/Source/Clients/NostalgicPlayer/NostalgicPlayer.csproj
+++ b/Source/Clients/NostalgicPlayer/NostalgicPlayer.csproj
@@ -140,6 +140,7 @@
     <ProjectReference Include="..\..\Agents\Players\OggVorbis\OggVorbis.csproj" />
     <ProjectReference Include="..\..\Agents\Players\Oktalyzer\Oktalyzer.csproj" />
     <ProjectReference Include="..\..\Agents\Players\Opus\Opus.csproj" />
+    <ProjectReference Include="..\..\Agents\Players\PumaTracker\PumaTracker.csproj" />
     <ProjectReference Include="..\..\Agents\Players\QuadraComposer\QuadraComposer.csproj" />
     <ProjectReference Include="..\..\Agents\Players\Sample\Sample.csproj" />
     <ProjectReference Include="..\..\Agents\Players\Sawteeth\Sawteeth.csproj" />
diff --git a/Source/Clients/NostalgicPlayerConsole/NostalgicPlayerConsole.csproj b/Source/Clients/NostalgicPlayerConsole/NostalgicPlayerConsole.csproj
index 3f50f7ff..5378ff99 100644
--- a/Source/Clients/NostalgicPlayerConsole/NostalgicPlayerConsole.csproj
+++ b/Source/Clients/NostalgicPlayerConsole/NostalgicPlayerConsole.csproj
@@ -64,6 +64,7 @@
     <ProjectReference Include="..\..\Agents\Players\OggVorbis\OggVorbis.csproj" />
     <ProjectReference Include="..\..\Agents\Players\Oktalyzer\Oktalyzer.csproj" />
     <ProjectReference Include="..\..\Agents\Players\Opus\Opus.csproj" />
+    <ProjectReference Include="..\..\Agents\Players\PumaTracker\PumaTracker.csproj" />
     <ProjectReference Include="..\..\Agents\Players\QuadraComposer\QuadraComposer.csproj" />
     <ProjectReference Include="..\..\Agents\Players\Sample\Sample.csproj" />
     <ProjectReference Include="..\..\Agents\Players\Sawteeth\Sawteeth.csproj" />
diff --git a/Source/NostalgicPlayer.sln b/Source/NostalgicPlayer.sln
index 782b2a45..e48d6c3d 100644
--- a/Source/NostalgicPlayer.sln
+++ b/Source/NostalgicPlayer.sln
@@ -194,6 +194,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NostalgicPlayerCKit", "Nost
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicAssembler", "Agents\Players\MusicAssembler\MusicAssembler.csproj", "{8CF82235-E51F-451D-A96A-CCF69398F414}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PumaTracker", "Agents\Players\PumaTracker\PumaTracker.csproj", "{58AEF3E7-23D4-457C-9868-4EB264DB0B95}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1528,6 +1530,22 @@ Global
 		{8CF82235-E51F-451D-A96A-CCF69398F414}.Release|x64.Build.0 = Release|Any CPU
 		{8CF82235-E51F-451D-A96A-CCF69398F414}.Release|x86.ActiveCfg = Release|Any CPU
 		{8CF82235-E51F-451D-A96A-CCF69398F414}.Release|x86.Build.0 = Release|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Debug|x64.Build.0 = Debug|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Debug|x86.Build.0 = Debug|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Release|ARM64.Build.0 = Release|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Release|x64.ActiveCfg = Release|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Release|x64.Build.0 = Release|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Release|x86.ActiveCfg = Release|Any CPU
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1619,6 +1637,7 @@ Global
 		{AB0D3F1A-FF8E-4579-846B-7EE689B7CC79} = {409138C0-F329-4BA5-8F10-1C401960E3AC}
 		{01471ED9-8505-4492-93B4-0E97FD995129} = {409138C0-F329-4BA5-8F10-1C401960E3AC}
 		{8CF82235-E51F-451D-A96A-CCF69398F414} = {76C2DEA4-D72F-4931-9ACA-B2DDC33BDE98}
+		{58AEF3E7-23D4-457C-9868-4EB264DB0B95} = {76C2DEA4-D72F-4931-9ACA-B2DDC33BDE98}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EA2EFEF5-9B3B-46F2-BE4B-077ED6CADA79}
diff --git a/Source/NostalgicPlayerPackage/Package.appxmanifest b/Source/NostalgicPlayerPackage/Package.appxmanifest
index 1f6f6273..147fcc10 100644
--- a/Source/NostalgicPlayerPackage/Package.appxmanifest
+++ b/Source/NostalgicPlayerPackage/Package.appxmanifest
@@ -1197,6 +1197,14 @@
             <uap:DisplayName>Music Assembler</uap:DisplayName>
           </uap:FileTypeAssociation>
         </uap:Extension>
+        <uap:Extension Category="windows.fileTypeAssociation">
+          <uap:FileTypeAssociation Name="pumafile">
+            <uap:SupportedFileTypes>
+              <uap:FileType ContentType="audio/x-puma">.puma</uap:FileType>
+            </uap:SupportedFileTypes>
+            <uap:DisplayName>PumaTracker</uap:DisplayName>
+          </uap:FileTypeAssociation>
+        </uap:Extension>
       </Extensions>
     </Application>
   </Applications>