Moves some functionality into GameBoardExtension, next we need to implment this in IconFactory
just trying to freaking commit
Fixing merged corrupution