diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs
index 47aab50cfd..33a923e2b0 100644
--- a/OpenRA.Game/Graphics/WorldRenderer.cs
+++ b/OpenRA.Game/Graphics/WorldRenderer.cs
@@ -301,16 +301,15 @@ namespace OpenRA.Graphics
 			{
 				foreach (var pip in pips.GetPips(selectedUnit))
 				{
-					var pipImages = new Animation("pips");
-					pipImages.PlayRepeating(pipStrings[(int)pip]);
-					spriteRenderer.DrawSprite(pipImages.Image, pipxyBase + pipxyOffset, "chrome");
-					pipxyOffset += new float2(4, 0);
-					
 					if (pipxyOffset.X+5 > selectedUnit.GetBounds(false).Width)
 					{
 						pipxyOffset.X = 0;
 						pipxyOffset.Y -= 4;
 					}
+					var pipImages = new Animation("pips");
+					pipImages.PlayRepeating(pipStrings[(int)pip]);
+					spriteRenderer.DrawSprite(pipImages.Image, pipxyBase + pipxyOffset, "chrome");
+					pipxyOffset += new float2(4, 0);
 				}
 				// Increment row
 				pipxyOffset.X = 0;
diff --git a/OpenRA.Mods.Cnc/TiberiumRefinery.cs b/OpenRA.Mods.Cnc/TiberiumRefinery.cs
index 4a7edb3682..3be56b7850 100644
--- a/OpenRA.Mods.Cnc/TiberiumRefinery.cs
+++ b/OpenRA.Mods.Cnc/TiberiumRefinery.cs
@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Cnc
 		public readonly int Capacity = 0;
 		public readonly int ProcessTick = 25;
 		public readonly int ProcessAmount = 50;
-		public object Create(Actor self) { return new TiberiumRefinery(self); }
+		public object Create(Actor self) { return new TiberiumRefinery(self, this); }
 	}
 
 	class TiberiumRefinery : ITick, IAcceptOre, IPips
@@ -47,10 +47,10 @@ namespace OpenRA.Mods.Cnc
 		[Sync]
 		public int Tiberium = 0;
 		
-		public TiberiumRefinery(Actor self)
+		public TiberiumRefinery(Actor self, TiberiumRefineryInfo info)
 		{
 			this.self = self;
-			Info = self.Info.Traits.Get<TiberiumRefineryInfo>();
+			Info = info;
 		}
 		
 		public void GiveOre(int amount)
diff --git a/OpenRA.Mods.RA/OreRefinery.cs b/OpenRA.Mods.RA/OreRefinery.cs
index 89fbf2651c..f9d2f6266a 100755
--- a/OpenRA.Mods.RA/OreRefinery.cs
+++ b/OpenRA.Mods.RA/OreRefinery.cs
@@ -18,6 +18,9 @@
  */
 #endregion
 
+using System;
+using System.Linq;
+using System.Collections.Generic;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
@@ -26,21 +29,59 @@ namespace OpenRA.Mods.RA
 {
 	class OreRefineryInfo : ITraitInfo
 	{
-		public object Create(Actor self) { return new OreRefinery(self); }
+		public readonly int Pips = 0;
+		public readonly int Capacity = 0;
+		public readonly int ProcessTick = 25;
+		public readonly int ProcessAmount = 50;
+		public object Create(Actor self) { return new OreRefinery(self, this); }
 	}
 
-	class OreRefinery : IAcceptOre
+	class OreRefinery : ITick, IAcceptOre, IPips
 	{
 		Actor self;
-		public OreRefinery(Actor self)
+		OreRefineryInfo Info;
+
+		[Sync]
+		int nextProcessTime = 0;
+		[Sync]
+		public int Ore = 0;
+		public OreRefinery(Actor self, OreRefineryInfo info)
 		{
 			this.self = self;
+			Info = info;
 		}
 		
 		public void GiveOre(int amount)
 		{
-			// TODO: Unbreak this	
+			Ore += amount;
+			if (Ore > Info.Capacity)
+				Ore = Info.Capacity;
 		}
+		
+		public void Tick(Actor self)
+		{
+			if (--nextProcessTime <= 0)
+			{
+				// Convert resources to cash
+				var pr = self.Owner.PlayerActor.traits.Get<PlayerResources>();
+				int amount = Math.Min(Ore, Info.ProcessAmount);
+					amount = Math.Min(amount, pr.OreCapacity - pr.Ore);
+				if (amount > 0)
+				{
+					Ore -=amount;
+					pr.GiveOre(amount);
+				}
+				nextProcessTime = Info.ProcessTick;
+			}
+		}
+		
+		public IEnumerable<PipType> GetPips(Actor self)
+		{
+			return Graphics.Util.MakeArray( Info.Pips, 
+				i => (Ore * 1.0f / Info.Capacity > i * 1.0f / Info.Pips) 
+					? PipType.Red : PipType.Transparent );
+		}
+		
 		public int2 DeliverOffset {	get { return new int2(1, 2); } }
 		public void OnDock(Actor harv, DeliverResources dockOrder)
 		{
diff --git a/mods/ra/structures.yaml b/mods/ra/structures.yaml
index 57a2d49133..cb04aa4de2 100644
--- a/mods/ra/structures.yaml
+++ b/mods/ra/structures.yaml
@@ -468,6 +468,10 @@ PROC:
 		Sight: 6
 	Bib:
 	OreRefinery:
+		Pips: 17
+		Capacity: 1000
+		ProcessTick: 25
+		ProcessAmount: 50
 	StoresOre:
 		Pips: 17
 		Capacity: 2000