diff --git a/minimapButton.cpp b/minimapButton.cpp
index c8a4f1d..617847e 100644
--- a/minimapButton.cpp
+++ b/minimapButton.cpp
@@ -1,7 +1,18 @@
 #include "minimapButton.h"
+#include "activeGameState.h"
+#include "game.h"
 #include "map.h"
 
+#include <stateManager.h>
+
 #include <node.h>
+#include <mesh.h>
+#include <material.h>
+#include <imageAsset.h>
+#include <assetManager.h>
+
+#include <algorithm>
+#include <vector>
 
 namespace battleship{
 	using namespace vb01;
@@ -17,6 +28,89 @@ namespace battleship{
 
 	void MinimapButton::update(){
 		Button::update();
+
+		Material *mat = rectNode->getMesh(0)->getMaterial();
+		Texture *tex = ((Material::TextureUniform*)mat->getUniform("diffuseMap"))->value;
+		ImageAsset *asset = (ImageAsset*)AssetManager::getSingleton()->getAsset(imagePath);
+		int width = asset->width, height = asset->height, numChannels = asset->numChannels;
+
+		Vector3 mapSize = Map::getSingleton()->getMapSize();
+		vector<pair<Unit*, Vector2>> unitMinimapPos;
+
+		for(Player *pl : Game::getSingleton()->getPlayers())
+			for(Unit *un : pl->getUnits()){
+				Vector2 coords = Vector2(
+					int(un->getPos().x / mapSize.x * width) - .5 * width,
+					int(un->getPos().z / mapSize.z * height) - .5 * height
+				);
+
+				unitMinimapPos.push_back(make_pair(un, coords));
+			}
+
+		ActiveGameState *activeState = (ActiveGameState*)GameManager::getSingleton()->getStateManager()->getAppStateByType(AppStateType::ACTIVE_STATE);
+		Player *mainPlayer = activeState->getPlayer();
+		vector<Unit*> units = mainPlayer->getUnits();
+
+		int size = width * height * numChannels;
+		int pxId = 0, numIter = 0;
+
+		u8 *oldImageData = activeState->getOldMinimapImage();
+
+		for(u8 *p = asset->image; p != asset->image + size; p += numChannels, pxId += numChannels, numIter++){
+			Vector2 coords = Vector2(
+				numIter % asset->width - .5 * asset->width,
+				numIter / asset->width - .5 * asset->height
+			);
+			float losFactor = .6, pxCol[3]{
+				losFactor * oldImageData[pxId + 0],
+				losFactor * oldImageData[pxId + 1],
+				losFactor * oldImageData[pxId + 2]
+			};
+
+			for(pair<Unit*, Vector2> unitPair : unitMinimapPos){
+				if(unitPair.first->getPlayer() == mainPlayer && unitPair.second == coords){
+					Vector3 plCol = mainPlayer->getColor();
+					pxCol[0] = plCol.x * 255;
+					pxCol[1] = plCol.y * 255;
+					pxCol[2] = plCol.z * 255;
+					break;
+				}
+
+				float minimapLos = unitPair.first->getLineOfSight() / mapSize.x * width;
+
+				if(unitPair.first->getPlayer() == mainPlayer && coords.getDistanceFrom(unitPair.second) < minimapLos){
+					bool foreignUnit = false;
+					Player *pl = nullptr;
+
+					for(pair<Unit*, Vector2> up : unitMinimapPos)
+						if(up.first->getPlayer() != mainPlayer && up.second == coords){
+							foreignUnit = true;
+							pl = up.first->getPlayer();
+							break;
+						}
+
+					if(foreignUnit){
+						Vector3 plCol = pl->getColor();
+						pxCol[0] = plCol.x * 255;
+						pxCol[1] = plCol.y * 255;
+						pxCol[2] = plCol.z * 255;
+					}
+					else{
+						pxCol[0] = oldImageData[pxId + 0];
+						pxCol[1] = oldImageData[pxId + 1];
+						pxCol[2] = oldImageData[pxId + 2];
+					}
+
+					break;
+				}
+			}
+
+			*p = pxCol[0];
+			*(p + 1) = pxCol[1];
+			*(p + 2) = pxCol[2];
+		}
+
+		tex->loadImageData(asset);
 	}
 
 	void MinimapButton::onClick(){