diff --git a/README.md b/README.md
index c6c1815..2670368 100644
--- a/README.md
+++ b/README.md
@@ -48,24 +48,82 @@ yarn coverage
 
 ## Roadmap
 
-- [ ] **First version of the frontend**: Register (create + validate email), login, create player, select race, and create research task. Track planet resources and active researches. Show player bonus in the UI
-- [ ] **game-api microservice, game-engine & frontend**: Players can build units (ships, troops, defenses & heroes) (research required to unlock units) specials & units from special planets???
-- [ ] **game-api microservice, game-engine & frontend**: Players can deploy fleets (only deploy spaceship units)
-- [ ] **game-api microservice, game-engine & frontend**: Players activate specials
-- [ ] **game-api & frontend**: Add CDN to store assets like images (profile pics, unit img, race img, research img, specials img, planets img...) update user profile pic flow
-- [ ] **frontend && Content**: Add translate support in frontend
-- [ ] **Content**: Add all races, units, specials, heroes, special planets ???
-- [ ] **Content**: Players
+- [ ] **Authentication flows**: Create Users and update user flows.
+  - [ ] Register User
+  - [ ] Validate User (email verification)
+  - [ ] Login User
+  - [ ] Auto Refresh session token
+  - [ ] Change Password
+  - [ ] Forgot Password
+  - [ ] Delete User
+  - [ ] Change User email
+  - [ ] Change User data
+- [ ] **Create Players**: Player Creation flow.
+  - [ ] Select player universe.
+  - [ ] Select race.
+  - [ ] Show player dashboard.
+  - [ ] Universes as a code.
+  - [ ] Races as a code.
+  - [ ] Units as a code.
+- [ ] **Build Units**: Players build units:
+  - [ ] Build race Troops
+  - [ ] Build race Spaceships
+  - [ ] Build race Defenses
+  - [ ] Build race Heroes
+  - [ ] Build special Units
+  - [ ] Build special Heroes
+- [ ] **Fleets**: Players can crate fleets:
+  - [ ] Explore planet fleets (create explore reports)
+  - [ ] Establish planetary base fleets
+  - [ ] Deploy units fleets (move units and resources) => see all visible fleets in real time in the planet
+  - [ ] collect resources fleets
+  - [ ] transport resources/troops/star fighters fleets
+  - [ ] attack planet fleets
+  - [ ] conquer planet fleets
+  - [ ] counter-attack planet fleets
+  - [ ] pirate attack fleets
+- [ ] **Battles**: Players can crate fleets:
+  - [ ] Battle reports
+  - [ ] Implement battles
+  - [ ] Capture units feature
+- [ ] **Extra frontend features**: Frontend sections:
+  - [ ] schedule tasks feature
+  - [ ] notifications feature
+  - [ ] favorite planets feature
+  - [ ] snackbars feature
+  - [ ] messages in game feature (add a chat?)
+  - [ ] Game alerts in game feature (example: news, maintenance, bugs etc)
+  - [ ] Exploration reports feature
+  - [ ] Battle reports feature
+  - [ ] Points section
+  - [ ] Player Task section
+- [ ] **Active Specials**: Players enable/disable specials
+  - [ ] race Specials (researches?)
+  - [ ] heroe Specials
+  - [ ] planet Specials
+- [ ] **CDN for images and assets**: Add CDN to store assets like images (player profile pics ???)
+- [x] **translations**: Add translate support in the Frontend:
+  - [ ] spanish translations
+  - [ ] english translations
+  - [ ] galician translations
+  - [ ] french translations
+  - [ ] italian translations
+  - [ ] german translations
+- [ ] **Content**: all content via game migrations
+  - [ ] Races
+  - [ ] Units
+  - [ ] Heroes
+  - [ ] Specials
+  - [ ] Planets
+  - [ ] Special Planets
+  - [ ] Special Units
 - [x] **Auth microservice**: Create users, validate email, retrieve user info, and create user sessions (JWT)
-- [ ] **Pending Auth microservice endpoints**: Change password, forgot password, reset password, update user data and delete account
-- [x] **Auth microservice**: Add unit tests with jest
-- [x] **Github actions**: Add Github actions (test, coverage reports with coveralls)
-- [ ] **Pending Github actions**: Add Sonar action
-- [x] **game-api**: Add migration support
-- [x] **game-engine**: Create Universe (define races, planets)
-- [x] **game-api microservice**: Create a player (select race & select universe & principal planet)
-- [x] **game-engine**: Define task types & processing scheduler
-- [x] **game-api microservice**: Players can create tasks
-- [ ] **first release**: Release system & dev & prod environments (GitHub actions).
-- [ ] **preview PR branches**: (Github actions)
+- [ ] **Github actions**: Add Github actions
+  - [ ] Linter Action
+  - [ ] Test Action
+  - [ ] Coverage Action
+  - [ ] Sonar Action
+  - [ ] Deploy test branch Action
+- [x] **Tests**: Add unit tests with jest
+- [ ] **First release**: Release system & dev & prod environments (GitHub actions).
 - [ ] **Badges**: Add badges in the README.md
diff --git a/packages/frontend/public/planets/unexplored_planet.jpeg b/packages/frontend/public/planets/unexplored_planet.jpeg
new file mode 100644
index 0000000..73838ac
Binary files /dev/null and b/packages/frontend/public/planets/unexplored_planet.jpeg differ
diff --git a/packages/frontend/public/units/pirates/spaceships/pirate_scrap_fighter_unit.jpeg b/packages/frontend/public/units/pirates/spaceships/pirate_scrap_fighter_unit.jpeg
new file mode 100644
index 0000000..5091785
Binary files /dev/null and b/packages/frontend/public/units/pirates/spaceships/pirate_scrap_fighter_unit.jpeg differ
diff --git a/packages/frontend/src/components/active-units-build/ActiveUnitsBuild.tsx b/packages/frontend/src/components/active-units-build/ActiveUnitsBuild.tsx
index 969b1b3..adc9d0d 100644
--- a/packages/frontend/src/components/active-units-build/ActiveUnitsBuild.tsx
+++ b/packages/frontend/src/components/active-units-build/ActiveUnitsBuild.tsx
@@ -54,7 +54,7 @@ function ActiveUnitsBuild({ activeBuild, activeBuildCountdown }: ActiveUnitsBuil
 
   return (
     <Paper variant="outlined">
-      <UnitCard disableBorder unit={unit} amount={activeBuild.amount}>
+      <UnitCard disableBorder unit={unit} amount={activeBuild.amount} isAvailable>
         {/* unit build countdown */}
         <Box position={'absolute'} left={0} bottom={0} padding={1}>
           <Paper variant="outlined">
diff --git a/packages/frontend/src/components/build-units-queue/BuildUnitsQueue.tsx b/packages/frontend/src/components/build-units-queue/BuildUnitsQueue.tsx
index f98e8f4..9846bc5 100644
--- a/packages/frontend/src/components/build-units-queue/BuildUnitsQueue.tsx
+++ b/packages/frontend/src/components/build-units-queue/BuildUnitsQueue.tsx
@@ -108,7 +108,7 @@ function QueueItem({ unit, amount, player, index }: QueueItemProps) {
         onMouseEnter={() => setShowRemoveButton(true)}
         onMouseLeave={() => setShowRemoveButton(false)}
       >
-        <UnitCard showNameLabel={false} unit={unit} amount={amount} height={128} width={128}>
+        <UnitCard showNameLabel={false} unit={unit} amount={amount} height={128} width={128} isAvailable>
           <>
             {/* Countdown */}
             <Box position={'absolute'} top={20} sx={{ transform: 'translate(0, -50%)' }}>
diff --git a/packages/frontend/src/components/defenses-label/DefensesLabel.tsx b/packages/frontend/src/components/defenses-label/DefensesLabel.tsx
index e458ee3..1bdeb59 100644
--- a/packages/frontend/src/components/defenses-label/DefensesLabel.tsx
+++ b/packages/frontend/src/components/defenses-label/DefensesLabel.tsx
@@ -58,15 +58,15 @@ function getDefensesInThePlanet(player?: PlayerType, selectedPlanet?: PlanetType
     return 0
   }
 
-  const planetFleets = player.fleets.find(
-    (fleet) => isPlanetCoordinates(fleet.planet, selectedPlanet.coordinates) && !fleet.travel
+  const unitsInThePlanet = player.units.find(({ planet }) =>
+    isPlanetCoordinates(planet, selectedPlanet.coordinates)
   )
 
-  if (!planetFleets) {
+  if (!unitsInThePlanet) {
     return 0
   }
 
-  return planetFleets.units.reduce((defenses, { unit, amount }) => {
+  return unitsInThePlanet.units.reduce((defenses, { unit, amount }) => {
     if (unit.type === 'DEFENSE') {
       return defenses + amount
     }
diff --git a/packages/frontend/src/components/dialogs/BuildUnitsDialog.tsx b/packages/frontend/src/components/dialogs/BuildUnitsDialog.tsx
index 0e19ff8..b7cc541 100644
--- a/packages/frontend/src/components/dialogs/BuildUnitsDialog.tsx
+++ b/packages/frontend/src/components/dialogs/BuildUnitsDialog.tsx
@@ -24,7 +24,6 @@ import FortIcon from '@mui/icons-material/Fort'
 import { UnitType, UnitTypes } from 'game-api-microservice/src/types/Unit'
 import isHeroAlreadyBuild from 'game-engine/src/engine/units/isHeroAlreadyBuild'
 import computedBonus from 'game-engine/src/engine/bonus/computedBonus'
-import getAmountOfPlayerUnitsInThePlanet from 'game-engine/src/engine/units/getAmountOfPlayerUnitsInThePlanet'
 import calculateMaxPlayerEnergy from 'game-engine/src/engine/units/calculateMaxPlayerEnergy'
 import calculateCurrentPlayerEnergy from 'game-engine/src/engine/units/calculateCurrentPlayerEnergy'
 import calculateCurrentPlayerPopulation from 'game-engine/src/engine/units/calculateCurrentPlayerPopulation'
@@ -38,14 +37,14 @@ import { useTranslations } from '../../store/TranslationContext'
 import formatTimer from '../../utils/formatTimer'
 import formatNumber from '../../utils/formatNumber'
 import millisToSeconds from '../../utils/millisToSeconds'
-import Image from '../image/Image'
 import UnitStats from '../unit-stats/UnitStats'
 import { usePlayerResources } from '../../store/PlayerResourcesContext'
 import formatCoordinatesLabel from '../../utils/formatPlanetCoordinates'
 import { useTheme } from '../../store/ThemeContext'
 import UnitRequirements from '../unit-requirements/UnitRequirements'
 import UnitBonus from '../unit-bonus/UnitBonus'
-import getImage from '../../utils/getImage'
+import UnitCard from '../unit-card/UnitCard'
+import { useFleet } from '../../store/FleetContext'
 
 type BuildUnitDialogProps = {
   unitToBuild: UnitType
@@ -81,13 +80,19 @@ function BuildUnitsDialog({ unitToBuild, isOpen, setUnitToBuild }: BuildUnitDial
     activeBuildDefenses
   } = useBuildUnits()
 
+  const { unitsInThePlanet } = useFleet()
+
   const UnitIconComponent = unitIcon[unitToBuild.type]
 
   const resourceCost = amount * unitToBuild.resourceCost
-  const currentPopulation = calculateCurrentPlayerPopulation(player!)
+  const currentPopulation = player
+    ? calculateCurrentPlayerPopulation(player, player.units, player.fleets)
+    : 0
   const predictedPopulation = currentPopulation + amount
   const maxPlayerPopulation = calculateMaxPlayerPopulation(player!)
-  const currentEnergy = calculateCurrentPlayerEnergy(player!)
+  const currentEnergy = player
+    ? calculateCurrentPlayerEnergy(player, player.units, player.fleets)
+    : 0
   const predictedEnergy = currentEnergy + unitToBuild.energyCost * amount
   const maxPlayerEnergy = calculateMaxPlayerEnergy(player!)
 
@@ -131,11 +136,8 @@ function BuildUnitsDialog({ unitToBuild, isOpen, setUnitToBuild }: BuildUnitDial
   const buildUnitBonus = computedBonus(player!.perks, buildUnitsPerk[unitToBuild.type])
   const buildUnitDuration = millisToSeconds(unitToBuild.buildBaseTime * (100 / buildUnitBonus))
 
-  const troopsInThisPlanet = getAmountOfPlayerUnitsInThePlanet(
-    player!,
-    selectedPlanet!,
-    unitToBuild
-  )
+  const amountOfUnitsInThePlanet =
+    unitsInThePlanet.find(({ unit }) => unit.name === unit.name)?.amount || 0
 
   const error = getErrorLabel({
     isValidAmount,
@@ -169,73 +171,15 @@ function BuildUnitsDialog({ unitToBuild, isOpen, setUnitToBuild }: BuildUnitDial
       </IconButton>
 
       <DialogContent dividers>
-        <Paper sx={{ padding: 1 }}>
-          <Stack direction={'row'} justifyContent={'center'}>
-            <Box sx={{ position: 'relative' }}>
-              <Paper variant="outlined">
-                <Stack justifyContent="center" alignItems="center">
-                  <Image
-                    src={getImage(unitToBuild.name)}
-                    alt={translate(unitToBuild.name)}
-                    height={'230px'}
-                    width={'230px'}
-                    border
-                  />
-
-                  {/* Unit name */}
-                  <Box
-                    position={'absolute'}
-                    top={20}
-                    padding={1}
-                    maxWidth={'230px'}
-                    sx={{ transform: 'translate(0, -50%)' }}
-                  >
-                    <Paper variant="outlined">
-                      <Paper variant="outlined">
-                        <Stack
-                          direction={'row'}
-                          gap={0.5}
-                          padding={0.4}
-                          paddingLeft={0.6}
-                          paddingRight={0.8}
-                          alignItems={'center'}
-                        >
-                          {unitToBuild.isHero && <StarsIcon fontSize="small" color="info" />}
-                          <Typography variant="body1" fontSize={13}>
-                            {translate(unitToBuild.name)}
-                          </Typography>
-                        </Stack>
-                      </Paper>
-                    </Paper>
-                  </Box>
-
-                  {/* Amount of units in this planet */}
-                  <Box position={'absolute'} right={0} bottom={0} padding={1}>
-                    <Paper variant="outlined">
-                      <Tooltip
-                        title={translate(
-                          'GAME_BUILD_UNITS_PAGE_AMOUNT_OF_UNITS_IN_PLANET_TOOLTIP',
-                          formatNumber(troopsInThisPlanet, true)
-                        )}
-                        arrow
-                      >
-                        <Stack
-                          direction={'row'}
-                          gap={0.5}
-                          padding={0.4}
-                          paddingLeft={0.6}
-                          paddingRight={0.8}
-                          alignItems={'center'}
-                        >
-                          <GroupIcon fontSize="small" />
-                          <Typography fontSize={12}> {formatNumber(troopsInThisPlanet)}</Typography>
-                        </Stack>
-                      </Tooltip>
-                    </Paper>
-                  </Box>
-                </Stack>
-              </Paper>
-            </Box>
+        <Paper>
+          <Stack padding={1} direction={'row'} justifyContent={'center'}>
+            <UnitCard
+              height={230}
+              width={230}
+              unit={unitToBuild}
+              amount={amountOfUnitsInThePlanet}
+              isAvailable
+            />
           </Stack>
         </Paper>
 
@@ -263,6 +207,7 @@ function BuildUnitsDialog({ unitToBuild, isOpen, setUnitToBuild }: BuildUnitDial
         </Paper>
 
         {/* TODO: ADD TOOLTIP */}
+        {/* TODO: ADD 25% button... */}
 
         <Box minHeight={120} marginTop={1}>
           <Paper sx={{ padding: 1 }}>
@@ -274,7 +219,7 @@ function BuildUnitsDialog({ unitToBuild, isOpen, setUnitToBuild }: BuildUnitDial
                     helperText={showErrorLabel ? error : ''}
                     disabled={unitToBuild.isHero}
                     fullWidth
-                    placeholder="type the amount"
+                    placeholder="type an amount"
                     error={showErrorLabel}
                     value={amount || ''}
                     onChange={(event) => {
@@ -351,8 +296,11 @@ function BuildUnitsDialog({ unitToBuild, isOpen, setUnitToBuild }: BuildUnitDial
                           textAlign="center"
                           color={isValidPopulation ? 'textPrimary' : 'error'}
                         >
-                          {calculateCurrentPlayerPopulation(player!) +
-                            (unitToBuild.type === 'TROOP' ? amount : 0)}{' '}
+                          {calculateCurrentPlayerPopulation(
+                            player!,
+                            player!.units,
+                            player!.fleets
+                          ) + (unitToBuild.type === 'TROOP' ? amount : 0)}{' '}
                           / {formatNumber(calculateMaxPlayerPopulation(player!))}
                         </Typography>
                       </Stack>
@@ -377,7 +325,8 @@ function BuildUnitsDialog({ unitToBuild, isOpen, setUnitToBuild }: BuildUnitDial
                           textAlign="center"
                           color={isValidEnergy ? 'textPrimary' : 'error'}
                         >
-                          {calculateCurrentPlayerEnergy(player!) + amount * unitToBuild.energyCost}{' '}
+                          {calculateCurrentPlayerEnergy(player!, player!.units, player!.fleets) +
+                            amount * unitToBuild.energyCost}{' '}
                           /{formatNumber(calculateMaxPlayerEnergy(player!))}
                         </Typography>
                       </Stack>
@@ -471,9 +420,7 @@ function BuildUnitsDialog({ unitToBuild, isOpen, setUnitToBuild }: BuildUnitDial
         ) : (
           <Tooltip title={'Add units to planet queue'} arrow>
             <Button
-              disabled={
-                isLoading || !!error || isHeroAlreadyBuild(unitToBuild, player?.fleets || [])
-              }
+              disabled={isLoading || !!error || isHeroAlreadyBuild(unitToBuild, player!.units)}
               autoFocus
               onClick={performStartBuildUnits}
             >
diff --git a/packages/frontend/src/components/energy-label/EnergyLabel.tsx b/packages/frontend/src/components/energy-label/EnergyLabel.tsx
index daaddf5..de27443 100644
--- a/packages/frontend/src/components/energy-label/EnergyLabel.tsx
+++ b/packages/frontend/src/components/energy-label/EnergyLabel.tsx
@@ -23,7 +23,7 @@ function EnergyLabel() {
           player
             ? translate(
                 'GAME_PLAYER_STATS_ENERGY_TOOLTIP',
-                calculateCurrentPlayerEnergy(player),
+                calculateCurrentPlayerEnergy(player, player.units, player.fleets),
                 formatNumber(calculateMaxPlayerEnergy(player), true)
               )
             : ''
@@ -42,7 +42,7 @@ function EnergyLabel() {
             textAlign="center"
           >
             {player ? (
-              `${formatNumber(calculateCurrentPlayerEnergy(player), true)} / ${formatNumber(
+              `${formatNumber(calculateCurrentPlayerEnergy(player, player.units, player.fleets), true)} / ${formatNumber(
                 calculateMaxPlayerEnergy(player),
                 true
               )}`
diff --git a/packages/frontend/src/components/fleet/Fleet.tsx b/packages/frontend/src/components/fleet/Fleet.tsx
new file mode 100644
index 0000000..5984c1e
--- /dev/null
+++ b/packages/frontend/src/components/fleet/Fleet.tsx
@@ -0,0 +1,239 @@
+import { useEffect } from 'react'
+import Paper from '@mui/material/Paper'
+import Stack from '@mui/material/Stack'
+import Tooltip from '@mui/material/Tooltip'
+import Typography from '@mui/material/Typography'
+import Accordion from '@mui/material/Accordion'
+import Divider from '@mui/material/Divider'
+import AccordionSummary from '@mui/material/AccordionSummary'
+import AccordionDetails from '@mui/material/AccordionDetails'
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
+import RocketLaunchIcon from '@mui/icons-material/RocketLaunch'
+import GroupIcon from '@mui/icons-material/Group'
+import RocketIcon from '@mui/icons-material/Rocket'
+import AlarmIcon from '@mui/icons-material/Alarm'
+import VisibilityOffIcon from '@mui/icons-material/VisibilityOff'
+import VisibilityIcon from '@mui/icons-material/Visibility'
+import ArrowRightAltRoundedIcon from '@mui/icons-material/ArrowRightAltRounded'
+
+import { FleetType, FleetUnitsType } from 'game-api-microservice/src/types/Fleets'
+import { PlanetType } from 'game-api-microservice/src/types/Planet'
+
+import { useTranslations } from '../../store/TranslationContext'
+import formatTimer from '../../utils/formatTimer'
+import useCountdown from '../../hooks/useCountdown'
+import { usePlayer } from '../../store/PlayerContext'
+import waitTaskToFinish from '../../utils/waitTaskToFinish'
+import UnitCard from '../unit-card/UnitCard'
+import Image from '../image/Image'
+import formatCoordinatesLabel from '../../utils/formatPlanetCoordinates'
+
+type FleetProps = {
+  fleet: FleetType
+  onFinishFleet?: () => void
+}
+
+function Fleet({ fleet, onFinishFleet }: FleetProps) {
+  const { translate } = useTranslations()
+
+  const { loadPlayer } = usePlayer()
+
+  const fleetCountdown = useCountdown(fleet.arriveAt)
+
+  useEffect(() => {
+    async function updatePlayer() {
+      if (fleetCountdown === 0 && fleet.taskId) {
+        await waitTaskToFinish(fleet.taskId)
+        await loadPlayer()
+        onFinishFleet?.()
+      }
+    }
+
+    updatePlayer()
+  }, [fleetCountdown, loadPlayer, fleet, onFinishFleet])
+
+  // TODO: implement invisible fleets
+  const isInvisible = false
+
+  return (
+    <Accordion>
+      <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+        <Stack gap={1} direction={'row'} alignItems={'center'} flexGrow={1}>
+          <RocketLaunchIcon />
+
+          {isInvisible ? (
+            <Tooltip title={translate('INVISIBLE_FLEET_ACTIVATED_TOOLTIP')} arrow>
+              <VisibilityOffIcon fontSize="small" color="success" />
+            </Tooltip>
+          ) : (
+            <Tooltip title={translate('INVISIBLE_FLEET_NOT_ACTIVATED_TOOLTIP')} arrow>
+              <VisibilityIcon fontSize="small" color="disabled" />
+            </Tooltip>
+          )}
+
+          <FleetTypeLabel fleetType={fleet.fleetType} />
+
+          <AmountOfUnitsLabel fleetUnits={fleet.units} />
+
+          {/* TODO: fleet resources label ??? */}
+
+          <FleetPlanetsLabel
+            fromPlanet={fleet.fromPlanet}
+            toPlanet={fleet.toPlanet}
+            isReturning={fleet.isReturning}
+          />
+
+          <Paper variant="outlined">
+            <Stack direction={'row'} alignItems={'center'} gap={0.5} padding={0.5} paddingRight={1}>
+              <AlarmIcon fontSize="small" />
+              <Typography variant="body1" fontSize={12} textAlign={'center'}>
+                {formatTimer(fleetCountdown)}
+                {/* TODO: tooltip {formatTimestamp(fleet.travel?.arriveAt || 0)} */}
+              </Typography>
+            </Stack>
+          </Paper>
+        </Stack>
+      </AccordionSummary>
+
+      <Divider />
+
+      <AccordionDetails>
+        {/* TODO: implement fleet details */}
+        <Stack direction={'row'} gap={1}>
+          {fleet.units.map(({ unit, amount }) => (
+            <UnitCard
+              key={unit.name}
+              unit={unit}
+              amount={amount}
+              height={140}
+              width={140}
+              isAvailable
+            />
+          ))}
+        </Stack>
+      </AccordionDetails>
+    </Accordion>
+  )
+}
+
+export default Fleet
+
+function FleetTypeLabel({ fleetType = '' }: { fleetType?: string }) {
+  const { translate } = useTranslations()
+
+  return (
+    <Paper variant="outlined">
+      <Typography variant="body1" fontSize={12} textAlign={'center'} padding={0.5}>
+        {translate(fleetType)}
+      </Typography>
+    </Paper>
+  )
+}
+
+function AmountOfUnitsLabel({ fleetUnits }: { fleetUnits: FleetUnitsType[] }) {
+  const spaceships = fleetUnits.reduce((troops, { unit, amount }) => {
+    if (unit.type === 'SPACESHIP') {
+      return troops + amount
+    }
+
+    return troops
+  }, 0)
+
+  const troops = fleetUnits.reduce((troops, { unit, amount }) => {
+    if (unit.type === 'TROOP') {
+      return troops + amount
+    }
+
+    return troops
+  }, 0)
+
+  return (
+    <Paper variant="outlined">
+      <Stack direction={'row'} alignItems={'center'} gap={1} padding={0.5} paddingRight={1}>
+        <Stack direction={'row'} alignItems={'center'} gap={0.5}>
+          <RocketIcon fontSize="small" />
+          <Typography variant="body1" fontSize={12} textAlign={'center'}>
+            {spaceships}
+          </Typography>
+        </Stack>
+
+        <Stack direction={'row'} alignItems={'center'} gap={0.5}>
+          <GroupIcon fontSize="small" />
+          <Typography variant="body1" fontSize={12} textAlign={'center'}>
+            {troops}
+          </Typography>
+        </Stack>
+      </Stack>
+    </Paper>
+  )
+}
+
+type FleetPlanetsLabelProps = {
+  fromPlanet: PlanetType
+  toPlanet: PlanetType
+  isReturning: boolean
+}
+
+function FleetPlanetsLabel({ fromPlanet, toPlanet, isReturning }: FleetPlanetsLabelProps) {
+  return (
+    <Stack direction={'row'} gap={1} flexGrow={1} justifyContent={'center'} alignItems={'center'}>
+      {isReturning ? (
+        <>
+          <Tooltip arrow title={formatCoordinatesLabel(toPlanet.coordinates)}>
+            <div>
+              <Image
+                src={toPlanet.imgUrl}
+                alt={toPlanet.name}
+                height={'36px'}
+                width={'36px'}
+                border
+              />
+            </div>
+          </Tooltip>
+
+          <ArrowRightAltRoundedIcon sx={{ transform: 'scaleX(-1)' }} />
+
+          <Tooltip arrow title={formatCoordinatesLabel(fromPlanet.coordinates)}>
+            <div>
+              <Image
+                src={fromPlanet.imgUrl}
+                alt={fromPlanet.name}
+                height={'36px'}
+                width={'36px'}
+                border
+              />
+            </div>
+          </Tooltip>
+        </>
+      ) : (
+        <>
+          <Tooltip arrow title={formatCoordinatesLabel(fromPlanet.coordinates)}>
+            <div>
+              <Image
+                src={fromPlanet.imgUrl}
+                alt={fromPlanet.name}
+                height={'36px'}
+                width={'36px'}
+                border
+              />
+            </div>
+          </Tooltip>
+
+          <ArrowRightAltRoundedIcon />
+
+          <Tooltip arrow title={formatCoordinatesLabel(toPlanet.coordinates)}>
+            <div>
+              <Image
+                src={toPlanet.imgUrl}
+                alt={toPlanet.name}
+                height={'36px'}
+                width={'36px'}
+                border
+              />
+            </div>
+          </Tooltip>
+        </>
+      )}
+    </Stack>
+  )
+}
diff --git a/packages/frontend/src/components/planet-card/PlanetCard.tsx b/packages/frontend/src/components/planet-card/PlanetCard.tsx
new file mode 100644
index 0000000..6b0713c
--- /dev/null
+++ b/packages/frontend/src/components/planet-card/PlanetCard.tsx
@@ -0,0 +1,98 @@
+import Paper from '@mui/material/Paper'
+import Stack from '@mui/material/Stack'
+import Box from '@mui/material/Box'
+import Typography from '@mui/material/Typography'
+import Tooltip from '@mui/material/Tooltip'
+import { green, orange } from '@mui/material/colors'
+
+import { PlanetType } from 'game-api-microservice/src/types/Planet'
+import formatCoordinatesLabel from '../../utils/formatPlanetCoordinates'
+import Image from '../image/Image'
+import { useTranslations } from '../../store/TranslationContext'
+
+type PlanetCardProps = {
+  disableBorder?: boolean
+  planet: PlanetType
+  height?: number
+  width?: number
+  children?: JSX.Element | JSX.Element[]
+}
+
+function PlanetCard({ disableBorder = false, planet, children }: PlanetCardProps) {
+  const { translate } = useTranslations()
+
+  const planetLabel = formatCoordinatesLabel(planet.coordinates)
+
+  return (
+    <Box key={planetLabel} sx={{ position: 'relative' }}>
+      <Paper variant={disableBorder ? 'elevation' : 'outlined'}>
+        <Stack justifyContent="center" alignItems="center">
+          <Image
+            src={planet.imgUrl}
+            alt={planet.name}
+            height={'200px'}
+            width={'200px'}
+            border={!disableBorder}
+            disabled={!planet.isExplored}
+          />
+
+          {/* Planet name */}
+          {planet.isExplored && (
+            <Box
+              position={'absolute'}
+              top={20}
+              maxWidth={200}
+              sx={{ transform: 'translate(0, -50%)' }}
+            >
+              <Paper variant="outlined">
+                <Stack
+                  direction={'row'}
+                  gap={0.5}
+                  padding={0.4}
+                  paddingLeft={0.6}
+                  paddingRight={0.8}
+                  alignItems={'center'}
+                >
+                  {/* {unit.isHero && <StarsIcon fontSize="small" color="info" />} */}
+                  {/* TODO: isSpecial Planet! */}
+                  <Typography variant="body1" fontSize={12}>
+                    {planet.name}
+                  </Typography>
+                </Stack>
+              </Paper>
+            </Box>
+          )}
+
+          {/* Planet resource quality */}
+          {planet.isExplored && (
+            <Box position={'absolute'} left={0} bottom={0} padding={1}>
+              <Paper variant="outlined">
+                <Tooltip
+                  title={translate(
+                    'GAME_PLAYER_PLANET_RESOURCE_QUALITY_TOOLTIP',
+                    planet.resourceQuality || 0
+                  )}
+                  arrow
+                >
+                  <Typography
+                    variant="body1"
+                    fontSize={12}
+                    fontWeight={500}
+                    color={planet.resourceQuality > 50 ? green[600] : orange[600]}
+                    padding={0.4}
+                  >
+                    {planet.resourceQuality}%
+                  </Typography>
+                </Tooltip>
+              </Paper>
+            </Box>
+          )}
+
+          {children}
+        </Stack>
+      </Paper>
+    </Box>
+  )
+}
+
+export default PlanetCard
diff --git a/packages/frontend/src/components/population-label/PopulationLabel.tsx b/packages/frontend/src/components/population-label/PopulationLabel.tsx
index e422166..f68b394 100644
--- a/packages/frontend/src/components/population-label/PopulationLabel.tsx
+++ b/packages/frontend/src/components/population-label/PopulationLabel.tsx
@@ -26,7 +26,7 @@ function PopulationLabel() {
           player
             ? translate(
                 'GAME_PLAYER_STATS_POPULATION_TOOLTIP',
-                calculateCurrentPlayerPopulation(player),
+                calculateCurrentPlayerPopulation(player, player.units, player.fleets),
                 formatNumber(calculateMaxPlayerPopulation(player), true)
               )
             : undefined
@@ -45,7 +45,7 @@ function PopulationLabel() {
             textAlign="center"
           >
             {player ? (
-              `${formatNumber(calculateCurrentPlayerPopulation(player), true)} / ${formatNumber(
+              `${formatNumber(calculateCurrentPlayerPopulation(player, player.units, player.fleets), true)} / ${formatNumber(
                 calculateMaxPlayerPopulation(player),
                 true
               )}`
diff --git a/packages/frontend/src/components/unit-card/UnitCard.tsx b/packages/frontend/src/components/unit-card/UnitCard.tsx
index 1bb632f..0b6019f 100644
--- a/packages/frontend/src/components/unit-card/UnitCard.tsx
+++ b/packages/frontend/src/components/unit-card/UnitCard.tsx
@@ -18,6 +18,7 @@ import formatNumber from '../../utils/formatNumber'
 type UnitCardProps = {
   showNameLabel?: boolean
   disableBorder?: boolean
+  isAvailable: boolean
   unit: UnitType
   amount: number
   height?: number
@@ -37,6 +38,7 @@ const unitIcon = {
 function UnitCard({
   showNameLabel = true,
   disableBorder = false,
+  isAvailable,
   unit,
   amount,
   height = DEFAULT_HEIGHT,
@@ -46,6 +48,7 @@ function UnitCard({
   const { translate } = useTranslations()
 
   const UnitIconComponent = unitIcon[unit.type]
+
   return (
     <Box sx={{ position: 'relative' }}>
       <Paper variant={disableBorder ? 'elevation' : 'outlined'}>
@@ -55,17 +58,13 @@ function UnitCard({
             alt={translate(unit.name)}
             height={`${height}px`}
             width={`${width}px`}
-            border
+            border={!disableBorder}
+            disabled={!isAvailable}
           />
 
           {/* Unit name */}
           {showNameLabel && (
-            <Box
-              position={'absolute'}
-              top={20}
-              maxWidth={width}
-              sx={{ transform: 'translate(0, -50%)' }}
-            >
+            <Box position={'absolute'} top={0} padding={1} maxWidth={width}>
               <Paper variant="outlined">
                 <Stack
                   direction={'row'}
@@ -76,7 +75,7 @@ function UnitCard({
                   alignItems={'center'}
                 >
                   {unit.isHero && <StarsIcon fontSize="small" color="info" />}
-                  <Typography variant="body1" fontSize={12}>
+                  <Typography variant="body1" fontSize={12} textAlign={'center'}>
                     {translate(unit.name)}
                   </Typography>
                 </Stack>
diff --git a/packages/frontend/src/components/unit-requirements/UnitRequirements.tsx b/packages/frontend/src/components/unit-requirements/UnitRequirements.tsx
index a2d4ea0..7a13631 100644
--- a/packages/frontend/src/components/unit-requirements/UnitRequirements.tsx
+++ b/packages/frontend/src/components/unit-requirements/UnitRequirements.tsx
@@ -80,6 +80,7 @@ function UnitRequirements({ unitRequirements, unitName }: UnitRequirementsProps)
                     <Paper
                       variant="outlined"
                       sx={{
+                        flexGrow: 1,
                         padding: 1
                       }}
                     >
@@ -116,7 +117,7 @@ function UnitRequirements({ unitRequirements, unitName }: UnitRequirementsProps)
                             left={'50%'}
                             top={'50%'}
                           >
-                            <Typography fontSize={14} color={color} fontWeight={500}>
+                            <Typography fontSize={13} color={color} fontWeight={500}>
                               {level}
                             </Typography>
                           </Box>
diff --git a/packages/frontend/src/components/units-list/UnitsList.tsx b/packages/frontend/src/components/units-list/UnitsList.tsx
index b8b9bb4..9ae8138 100644
--- a/packages/frontend/src/components/units-list/UnitsList.tsx
+++ b/packages/frontend/src/components/units-list/UnitsList.tsx
@@ -8,7 +8,6 @@ import Button from '@mui/material/Button'
 import { UnitType, UnitTypes } from 'game-api-microservice/src/types/Unit'
 import checkUnitRequirements from 'game-engine/src/engine/units/checkUnitRequirements'
 import isHeroAlreadyBuild from 'game-engine/src/engine/units/isHeroAlreadyBuild'
-import getAmountOfPlayerUnitsInThePlanet from 'game-engine/src/engine/units/getAmountOfPlayerUnitsInThePlanet'
 import { PlanetType } from 'game-api-microservice/src/types/Planet'
 
 import { usePlayer } from '../../store/PlayerContext'
@@ -19,6 +18,7 @@ import BuildUnitsDialog from '../../components/dialogs/BuildUnitsDialog'
 import UnitRequirements from '../../components/unit-requirements/UnitRequirements'
 import UnitBonus from '../../components/unit-bonus/UnitBonus'
 import UnitCard from '../../components/unit-card/UnitCard'
+import { useFleet } from '../../store/FleetContext'
 
 type UnitsListProp = {
   unitType: UnitTypes
@@ -36,6 +36,7 @@ function UnitsList({ unitType }: UnitsListProp) {
   const [unitToBuild, setUnitToBuild] = useState<UnitType>()
 
   const { player, isPlayerLoading, selectedPlanet } = usePlayer()
+  const { unitsInThePlanet } = useFleet()
 
   const units = player && selectedPlanet ? [...selectedPlanet.units, ...player.race.units] : []
 
@@ -52,12 +53,7 @@ function UnitsList({ unitType }: UnitsListProp) {
           .filter((unit) => unit.type === unitType)
           .map((unit) => {
             const unitRequirements = checkUnitRequirements(unit, player)
-
-            const unitsInThisPlanet = getAmountOfPlayerUnitsInThePlanet(
-              player,
-              selectedPlanet,
-              unit
-            )
+            const amount = unitsInThePlanet.find(({ unit }) => unit.name === unit.name)?.amount || 0
 
             return (
               <Paper key={unit.name} variant="outlined">
@@ -67,9 +63,10 @@ function UnitsList({ unitType }: UnitsListProp) {
                     <UnitCard
                       disableBorder
                       unit={unit}
-                      amount={unitsInThisPlanet}
+                      amount={amount}
                       height={230}
                       width={230}
+                      isAvailable={unitRequirements.isUnitAvailable}
                     />
 
                     {/* Unit bonus Part */}
@@ -120,7 +117,7 @@ function UnitsList({ unitType }: UnitsListProp) {
                       variant="contained"
                       size="small"
                       disabled={
-                        !unitRequirements.isUnitAvailable || isHeroAlreadyBuild(unit, player.fleets)
+                        !unitRequirements.isUnitAvailable || isHeroAlreadyBuild(unit, player.units)
                       }
                       onClick={() => setUnitToBuild(unit)}
                     >
diff --git a/packages/frontend/src/endpoints/game/fleetsEndpoints.ts b/packages/frontend/src/endpoints/game/fleetsEndpoints.ts
new file mode 100644
index 0000000..1155e5b
--- /dev/null
+++ b/packages/frontend/src/endpoints/game/fleetsEndpoints.ts
@@ -0,0 +1,32 @@
+import { AxiosResponse } from 'axios'
+
+import { explorePlanetFleetResponseType } from 'game-api-microservice/src/types/Fleets'
+import { EXPLORE_PLANET_FLEET_PATH } from 'game-api-microservice/src/routes/constants'
+import { PlanetCoordinatesType } from 'game-api-microservice/src/types/Planet'
+
+import Api from '../Api'
+
+const gameBaseEndpoint = import.meta.env.VITE_GAME_SERVICE_ORIGIN
+
+export async function explorePlanetFleet(
+  fleetUnits: { unitName: string; amount: number }[],
+  fromPlanetCoordinates: PlanetCoordinatesType,
+  toPlanetCoordinates: PlanetCoordinatesType,
+  universeName: string,
+  executeTaskAt?: number
+): Promise<AxiosResponse<explorePlanetFleetResponseType>> {
+  const explorePlanetFleetEndpoint = `${gameBaseEndpoint}${EXPLORE_PLANET_FLEET_PATH}`
+
+  const payload = {
+    universeName,
+    fromPlanetCoordinates,
+    toPlanetCoordinates,
+    fleetUnits,
+    executeTaskAt
+  }
+
+  return await Api.post<explorePlanetFleetResponseType, typeof payload>(
+    explorePlanetFleetEndpoint,
+    payload
+  )
+}
diff --git a/packages/frontend/src/endpoints/game/galaxyEndpoints.ts b/packages/frontend/src/endpoints/game/galaxyEndpoints.ts
new file mode 100644
index 0000000..4eb48e6
--- /dev/null
+++ b/packages/frontend/src/endpoints/game/galaxyEndpoints.ts
@@ -0,0 +1,19 @@
+import { AxiosResponse } from 'axios'
+
+import { getGalaxyResponseType } from 'game-api-microservice/src/types/Planet'
+import { GALAXY_PATH } from 'game-api-microservice/src/routes/constants'
+
+import Api from '../Api'
+
+const gameBaseEndpoint = import.meta.env.VITE_GAME_SERVICE_ORIGIN
+
+export async function getGalaxy(
+  galaxy: number,
+  sector: number,
+  system: number,
+  universeName: string
+): Promise<AxiosResponse<getGalaxyResponseType>> {
+  const getGalaxyEndpoint = `${gameBaseEndpoint}${GALAXY_PATH}?galaxy=${galaxy}&sector=${sector}&system=${system}&universeName=${universeName}`
+
+  return await Api.get<getGalaxyResponseType>(getGalaxyEndpoint)
+}
diff --git a/packages/frontend/src/hooks/useCountdown.ts b/packages/frontend/src/hooks/useCountdown.ts
new file mode 100644
index 0000000..cfab747
--- /dev/null
+++ b/packages/frontend/src/hooks/useCountdown.ts
@@ -0,0 +1,24 @@
+import { useCallback, useState } from 'react'
+
+import getSecond from 'game-engine/src/helpers/getSecond'
+
+import usePolling from './usePolling'
+
+function useCountdown(executeTaskAt: number): number {
+  const [countdown, setCountdown] = useState<number>(
+    (executeTaskAt - getSecond(Date.now())) / 1_000
+  )
+
+  const updateCountdown = useCallback(() => {
+    setCountdown(() => {
+      const countdown = Math.floor((executeTaskAt - getSecond(Date.now())) / 1_000)
+      return countdown < 0 ? 0 : countdown
+    })
+  }, [executeTaskAt])
+
+  usePolling(updateCountdown)
+
+  return countdown
+}
+
+export default useCountdown
diff --git a/packages/frontend/src/pages/game/GameGalaxiesPage.tsx b/packages/frontend/src/pages/game/GameGalaxiesPage.tsx
index caccbd9..f5f0ab3 100644
--- a/packages/frontend/src/pages/game/GameGalaxiesPage.tsx
+++ b/packages/frontend/src/pages/game/GameGalaxiesPage.tsx
@@ -1,11 +1,288 @@
-import SectionUnderConstruction from '../../components/section-under-construction/SectionUnderConstruction'
+import { useCallback, useEffect, useState } from 'react'
+import Paper from '@mui/material/Paper'
+import Stack from '@mui/material/Stack'
+import Box from '@mui/material/Box'
+import Typography from '@mui/material/Typography'
+import IconButton from '@mui/material/IconButton'
+import Tooltip from '@mui/material/Tooltip'
+import TravelExploreIcon from '@mui/icons-material/TravelExplore'
+import RocketLaunchIcon from '@mui/icons-material/RocketLaunch'
+import PublicIcon from '@mui/icons-material/Public'
+import NavigateNextRoundedIcon from '@mui/icons-material/NavigateNextRounded'
+import NavigateBeforeRoundedIcon from '@mui/icons-material/NavigateBeforeRounded'
+
+import { PlanetType } from 'game-api-microservice/src/types/Planet'
+import { PlanetCoordinatesType } from 'game-api-microservice/src/types/Planet'
+
+import { usePlayer } from '../../store/PlayerContext'
+import Loader from '../../components/loader/Loader'
+import formatCoordinatesLabel from '../../utils/formatPlanetCoordinates'
+import { getGalaxy } from '../../endpoints/game/galaxyEndpoints'
+import { useGameInfo } from '../../store/GameInfoContext'
+import { useTranslations } from '../../store/TranslationContext'
+import { useFleet } from '../../store/FleetContext'
+import Fleet from '../../components/fleet/Fleet'
+import PlanetCard from '../../components/planet-card/PlanetCard'
 
 function GameGalaxiesPage() {
+  const { translate } = useTranslations()
+  const { player, isPlayerLoading, selectedPlanet } = usePlayer()
+  const { explorePlanetFleet, unitsInThePlanet, fleetsInThePlanet } = useFleet()
+  const { selectedUniverse } = useGameInfo()
+
+  const universeName = selectedUniverse?.name
+
+  const [galaxy, setGalaxy] = useState(selectedPlanet?.coordinates.galaxy)
+  const [sector, setSector] = useState(selectedPlanet?.coordinates.sector)
+  const [system, setSystem] = useState(selectedPlanet?.coordinates.system)
+
+  const [planets, setPlanets] = useState<PlanetType[]>([])
+
+  useEffect(() => {
+    if (selectedPlanet) {
+      setGalaxy((galaxy) => galaxy || selectedPlanet.coordinates.galaxy)
+      setSector((sector) => sector || selectedPlanet.coordinates.sector)
+      setSystem((system) => system || selectedPlanet.coordinates.system)
+    }
+  }, [selectedPlanet])
+
+  const refreshPlanets = useCallback(async () => {
+    if (universeName && galaxy && sector && system) {
+      const {
+        data: { planets }
+      } = await getGalaxy(galaxy, sector, system, universeName)
+
+      setPlanets(planets)
+    }
+  }, [galaxy, sector, system, universeName])
+
+  useEffect(() => {
+    refreshPlanets()
+  }, [refreshPlanets])
+
+  // TODO: onFinish a fleet refresh planets
+
+  if (!player || isPlayerLoading || !selectedPlanet) {
+    return <Loader isLoading />
+  }
+
+  const probeUnit = unitsInThePlanet.find(({ unit }) => unit.subtype === 'PROBE')?.unit
+  // TODO: ADD amount of fleets available to check if its disabled or not
+
+  async function fastExplorePlanetFleet(toPlanetCoordinates: PlanetCoordinatesType) {
+    // TODO: add loading state
+    if (probeUnit && selectedPlanet) {
+      const exploreFleet = [{ unitName: probeUnit.name, amount: 1 }]
+      await explorePlanetFleet(exploreFleet, selectedPlanet.coordinates, toPlanetCoordinates)
+    }
+  }
+
   return (
-    <>
-      <h1 style={{ textAlign: 'center' }}>Game Galaxies Page</h1>
-      <SectionUnderConstruction />
-    </>
+    <Stack gap={1} padding={1}>
+      {/* TODO: ALL fleets, update this to only use new fleets */}
+      <Stack gap={1}>
+        {fleetsInThePlanet.map((planetFleet, index) => {
+          return <Fleet key={index} fleet={planetFleet} onFinishFleet={refreshPlanets} />
+        })}
+      </Stack>
+
+      {/* TODO: Planet Coordinates selector */}
+      <Paper variant="outlined">
+        <Box padding={1}>
+          <Stack direction={'row'} gap={3} padding={1}>
+            {/* Galaxy selector */}
+            <Stack gap={1} justifyContent={'center'}>
+              <Stack direction={'row'} gap={0.5} justifyContent={'center'} alignItems={'center'}>
+                <Tooltip title={translate('PREVIOUS_GALAXY_SELECTOR')}>
+                  <IconButton
+                    size="small"
+                    disabled={!probeUnit}
+                    onClick={() => setGalaxy((galaxy) => galaxy! - 1)}
+                  >
+                    <NavigateBeforeRoundedIcon />
+                  </IconButton>
+                </Tooltip>
+                <Paper variant="outlined">
+                  <Typography
+                    variant="body1"
+                    textAlign={'center'}
+                    padding={1}
+                    paddingLeft={2}
+                    paddingRight={2}
+                  >
+                    {galaxy}
+                  </Typography>
+                </Paper>
+                <Tooltip title={translate('NEXT_GALAXY_SELECTOR')}>
+                  <IconButton
+                    size="small"
+                    disabled={!probeUnit}
+                    onClick={() => setGalaxy((galaxy) => galaxy! + 1)}
+                  >
+                    <NavigateNextRoundedIcon />
+                  </IconButton>
+                </Tooltip>
+              </Stack>
+
+              <Typography variant="body1" textAlign={'center'}>
+                Galaxy
+              </Typography>
+            </Stack>
+
+            {/* Sector selector */}
+            <Stack gap={1} justifyContent={'center'}>
+              <Stack direction={'row'} gap={0.5} justifyContent={'center'} alignItems={'center'}>
+                <Tooltip title={translate('PREVIOUS_SECTOR_SELECTOR')}>
+                  <IconButton
+                    size="small"
+                    disabled={!probeUnit}
+                    onClick={() => setSector((sector) => sector! - 1)}
+                  >
+                    <NavigateBeforeRoundedIcon />
+                  </IconButton>
+                </Tooltip>
+                <Paper variant="outlined">
+                  <Typography
+                    variant="body1"
+                    textAlign={'center'}
+                    padding={1}
+                    paddingLeft={2}
+                    paddingRight={2}
+                  >
+                    {sector}
+                  </Typography>
+                </Paper>
+                <Tooltip title={translate('NEXT_SECTOR_SELECTOR')}>
+                  <IconButton
+                    size="small"
+                    disabled={!probeUnit}
+                    onClick={() => setSector((sector) => sector! + 1)}
+                  >
+                    <NavigateNextRoundedIcon />
+                  </IconButton>
+                </Tooltip>
+              </Stack>
+
+              <Typography variant="body1" textAlign={'center'}>
+                Sector
+              </Typography>
+            </Stack>
+
+            {/* System selector */}
+            <Stack gap={1} justifyContent={'center'}>
+              <Stack direction={'row'} gap={0.5} justifyContent={'center'} alignItems={'center'}>
+                <Tooltip title={translate('PREVIOUS_SYSTEM_SELECTOR')}>
+                  <IconButton
+                    size="small"
+                    disabled={!probeUnit}
+                    onClick={() => setSystem((system) => system! - 1)}
+                  >
+                    <NavigateBeforeRoundedIcon />
+                  </IconButton>
+                </Tooltip>
+                <Paper variant="outlined">
+                  <Typography
+                    variant="body1"
+                    textAlign={'center'}
+                    padding={1}
+                    paddingLeft={2}
+                    paddingRight={2}
+                  >
+                    {system}
+                  </Typography>
+                </Paper>
+                <Tooltip title={translate('NEXT_SYSTEM_SELECTOR')}>
+                  <IconButton
+                    size="small"
+                    disabled={!probeUnit}
+                    onClick={() => setSystem((system) => system! + 1)}
+                  >
+                    <NavigateNextRoundedIcon />
+                  </IconButton>
+                </Tooltip>
+              </Stack>
+
+              <Typography variant="body1" textAlign={'center'}>
+                System
+              </Typography>
+            </Stack>
+
+            {/* TODO: SHOW SPY PROBES AVAILABLE IN THE PLANET!! */}
+          </Stack>
+        </Box>
+      </Paper>
+
+      <Stack direction={'row'} flexWrap={'wrap'} justifyContent={'center'} gap={1}>
+        {planets.map((planet) => {
+          const planetLabel = formatCoordinatesLabel(planet.coordinates)
+
+          return (
+            <Box key={planetLabel}>
+              <Paper variant={'outlined'}>
+                <Stack justifyContent="center" alignItems="center">
+                  <PlanetCard planet={planet} disableBorder>
+                    {/* Fleet action buttons */}
+                    <Box position={'absolute'} right={0} bottom={0} padding={1}>
+                      <Paper variant="outlined">
+                        <Stack
+                          direction={'row'}
+                          padding={0.2}
+                          justifyContent={'flex-start'}
+                          alignItems={'center'}
+                        >
+                          {/* fleet button */}
+                          {/* TODO: disable button if no units are present */}
+                          {/* TODO: disable button if max number of active player fleets */}
+                          {/* TODO: disable button if it is the selected planet ?? */}
+                          {/* TODO: redirect to create new fleet page */}
+                          <Tooltip title="send fleet">
+                            <IconButton aria-label="spy planet" size="small">
+                              <RocketLaunchIcon fontSize="inherit" />
+                            </IconButton>
+                          </Tooltip>
+
+                          {/* Planet Colony fast button */}
+                          {/* TODO: disable button if no troops and ships are present */}
+                          {/* TODO: disable button if max number of colonies */}
+                          {/* TODO: disable button if it is a unexplored planet and has an owner ?? */}
+                          {/* TODO: disable button if users clicks on it! */}
+                          <Tooltip title="Colony planet">
+                            <IconButton
+                              aria-label="colony planet"
+                              size="small"
+                              // disabled={!probeUnit}
+                              // onClick={() => fastExplorePlanetFleet(planet.coordinates)}
+                            >
+                              <PublicIcon fontSize="inherit" />
+                            </IconButton>
+                          </Tooltip>
+
+                          {/* Explore Planet fast button */}
+                          {/* TODO: disable button if no probes are present */}
+                          {/* TODO: disable button if max number of active player fleets */}
+                          {/* TODO: disable button if it is the selected planet ?? */}
+                          {/* TODO: disable button if users clicks on it! */}
+                          <Tooltip title={translate('spy/explore planet')}>
+                            <IconButton
+                              aria-label="spy planet"
+                              size="small"
+                              disabled={!probeUnit}
+                              onClick={() => fastExplorePlanetFleet(planet.coordinates)}
+                            >
+                              <TravelExploreIcon fontSize="inherit" />
+                            </IconButton>
+                          </Tooltip>
+                        </Stack>
+                      </Paper>
+                    </Box>
+                  </PlanetCard>
+                </Stack>
+              </Paper>
+            </Box>
+          )
+        })}
+      </Stack>
+    </Stack>
   )
 }
 
diff --git a/packages/frontend/src/pages/game/GamePage.tsx b/packages/frontend/src/pages/game/GamePage.tsx
index 50084a4..f91e868 100644
--- a/packages/frontend/src/pages/game/GamePage.tsx
+++ b/packages/frontend/src/pages/game/GamePage.tsx
@@ -22,6 +22,7 @@ import { BuildUnitsProvider, useBuildUnits } from '../../store/buildUnitsContext
 import ActiveResearch from '../../components/active-research/ActiveResearch'
 import ActiveUnitsBuild from '../../components/active-units-build/ActiveUnitsBuild'
 import DefensesLabel from '../../components/defenses-label/DefensesLabel'
+import { FleetProvider } from '../../store/FleetContext'
 
 function GamePage() {
   const { logout, sessionToken } = useAuthorization()
@@ -156,7 +157,9 @@ function GamePageWithGameProviders() {
         <ResearchProvider>
           <BuildUnitsProvider>
             <PlayerResourcesProvider>
-              <GamePage />
+              <FleetProvider>
+                <GamePage />
+              </FleetProvider>
             </PlayerResourcesProvider>
           </BuildUnitsProvider>
         </ResearchProvider>
diff --git a/packages/frontend/src/store/FleetContext.tsx b/packages/frontend/src/store/FleetContext.tsx
new file mode 100644
index 0000000..91b2d93
--- /dev/null
+++ b/packages/frontend/src/store/FleetContext.tsx
@@ -0,0 +1,120 @@
+import { createContext, useCallback, useContext, useMemo } from 'react'
+
+import { FleetType, FleetUnitsType } from 'game-api-microservice/src/types/Fleets'
+import { PlanetCoordinatesType } from 'game-api-microservice/src/types/Planet'
+import { TaskType } from 'game-api-microservice/src/types/Task'
+import isPlanetCoordinates from 'game-engine/src/engine/planets/isPlanetCoordinates'
+
+import * as fleetsEndpoints from '../endpoints/game/fleetsEndpoints'
+import { usePlayer } from './PlayerContext'
+import { useGameInfo } from './GameInfoContext'
+import waitTaskToStart from '../utils/waitTaskToStart'
+
+const initialContext = {
+  fleets: [],
+  unitsInThePlanet: [],
+  fleetsInThePlanet: [],
+  explorePlanetFleet: () => Promise.resolve({} as TaskType<'START_FLEET_UNITS_TASK'>)
+}
+
+type fleetContextValue = {
+  fleets: FleetType[]
+  unitsInThePlanet: FleetUnitsType[]
+  fleetsInThePlanet: FleetType[]
+  explorePlanetFleet: (
+    fleetUnits: {
+      unitName: string
+      amount: number
+    }[],
+    fromPlanetCoordinates: PlanetCoordinatesType,
+    toPlanetCoordinates: PlanetCoordinatesType
+  ) => Promise<TaskType<'START_FLEET_UNITS_TASK'>>
+}
+
+const fleetContext = createContext<fleetContextValue>(initialContext)
+
+function useFleet() {
+  const context = useContext(fleetContext)
+
+  if (!context) {
+    throw new Error('useFleet should be within GameInfoContext Provider')
+  }
+
+  return context
+}
+
+type FleetProviderProps = {
+  children: JSX.Element | JSX.Element[]
+}
+
+function FleetProvider({ children }: FleetProviderProps) {
+  const { selectedUniverse } = useGameInfo()
+  const { player, selectedPlanet, loadPlayer } = usePlayer()
+
+  const fleets = useMemo(() => player?.fleets || [], [player])
+
+  const fleetsInThePlanet = useMemo(() => {
+    if (!selectedPlanet || !player) {
+      return []
+    }
+
+    const playerFleets = player.fleets.filter(
+      (playerFleet) =>
+        isPlanetCoordinates(playerFleet.toPlanet, selectedPlanet?.coordinates) ||
+        isPlanetCoordinates(playerFleet.fromPlanet, selectedPlanet?.coordinates)
+    )
+
+    return playerFleets
+  }, [player, selectedPlanet])
+
+  const unitsInThePlanet = useMemo(() => {
+    if (!selectedPlanet || !player) {
+      return []
+    }
+
+    const planetUnits = player.units.find(({ planet }) =>
+      isPlanetCoordinates(planet, selectedPlanet.coordinates)
+    )
+
+    return planetUnits?.units || []
+  }, [player, selectedPlanet])
+
+  const universeName = selectedUniverse?.name || ''
+
+  const explorePlanetFleet = useCallback(
+    async (
+      fleetUnits: {
+        unitName: string
+        amount: number
+      }[],
+      fromPlanetCoordinates: PlanetCoordinatesType,
+      toPlanetCoordinates: PlanetCoordinatesType
+    ) => {
+      const response = await fleetsEndpoints.explorePlanetFleet(
+        fleetUnits,
+        fromPlanetCoordinates,
+        toPlanetCoordinates,
+        universeName
+        // executeTaskAt
+      )
+
+      const { task } = response.data
+      await waitTaskToStart(task.taskId)
+      await loadPlayer()
+      return task
+    },
+    [universeName, loadPlayer]
+  )
+
+  const value = {
+    fleets,
+    unitsInThePlanet,
+    fleetsInThePlanet,
+
+    explorePlanetFleet
+  }
+
+  return <fleetContext.Provider value={value}>{children}</fleetContext.Provider>
+}
+
+export { useFleet, FleetProvider }
diff --git a/packages/frontend/src/translations/english.json b/packages/frontend/src/translations/english.json
index 2b6c44d..af58691 100644
--- a/packages/frontend/src/translations/english.json
+++ b/packages/frontend/src/translations/english.json
@@ -193,10 +193,10 @@
   "TROOP_PIRATE_CORSAIR_DESCRIPTION": "Pirate Corsairs are the elite of the pirate fleet, promoted for their cruelty and cunning in battle. Equipped with advanced weaponry and spatial camouflage devices, these commanders are formidable in direct combat and covert operations. Their presence on the battlefield ensures chaos among enemy ranks, dismantling defenses and capturing ships with brutal efficiency.",
   "SPACESHIP_PIRATE_RECON_DRONE_NAME": "Spy Probe",
   "SPACESHIP_PIRATE_RECON_DRONE_DESCRIPTION": "The Pirate Spy Probe is an essential yet unobtrusive unit, designed for stealthy information gathering. Equipped with advanced cloaking technology, this probe can infiltrate enemy territories undetected, providing crucial data on opponents' positions and movements, setting the stage for future raids and looting.",
+  "SPACESHIP_PIRATE_SCRAP_FIGHTER_NAME": "Pirate scrap fighter",
+  "SPACESHIP_PIRATE_SCRAP_FIGHTER_DESCRIPTION": "The Pirate Interceptor is a ship specifically designed for tactical combat against enemy fighters. Fast and agile, this fighter is equipped with advanced weapon systems, salvaged and reconfigured from previous downings. Ideal for ambushes and rapid strikes, the Pirate Interceptor specializes in neutralizing fighter escorts that protect space merchant fleets. Its ability to infiltrate and strike with precision makes it a formidable threat to any light defense formation.",
   "SPACESHIP_PIRATE_STAR_FIGHTER_NAME": "Pirate Starfighter",
   "SPACESHIP_PIRATE_STAR_FIGHTER_DESCRIPTION": "The Pirate Fighter is a robust and heterogeneous ship, assembled from parts and systems stolen from other races. Far from standing out for its elegance or advanced technology, these ships excel in resilience and adaptability in combat. Equipped with a mix of improvised armaments, Pirate Fighters are unpredictable in battle, capable of surprising enemies who underestimate their effectiveness. Additionally, parts of their original components have been removed to make room for secret compartments designed for smuggling cargo, offering exceptional cargo capacity at the expense of reduced attack and defense capabilities.",
-  "SPACESHIP_PIRATE_INTERCEPTOR_NAME": "Pirate Interceptor",
-  "SPACESHIP_PIRATE_INTERCEPTOR_DESCRIPTION": "The Pirate Interceptor is a ship specifically designed for tactical combat against enemy fighters. Fast and agile, this fighter is equipped with advanced weapon systems, salvaged and reconfigured from previous downings. Ideal for ambushes and rapid strikes, the Pirate Interceptor specializes in neutralizing fighter escorts that protect space merchant fleets. Its ability to infiltrate and strike with precision makes it a formidable threat to any light defense formation.",
   "SPACESHIP_PIRATE_CRUISER_NAME": "Pirate Cruiser",
   "SPACESHIP_PIRATE_CRUISER_DESCRIPTION": "The Pirate Space Cruiser is a larger ship, designed for deep raids into lightly defended territories. Capable of accommodating a small crew of pirates, this cruiser is commonly used by raiders targeting merchant population centers on remote planets and unprotected systems. Armed with assault cannons and rapid boarding systems, it allows pirates to launch surprise attacks, plunder resources, and retreat before defense forces can respond. Its reinforced structure and enhanced cloaking systems ensure an efficient entry and exit, making it the perfect vehicle for hit-and-run operations.",
   "SPACESHIP_PIRATE_FRIGATE_NAME": "Pirate Frigate",
@@ -221,5 +221,7 @@
   "SPACESHIP_PIRATE_ROYAL_FORTUNE_HERO_NAME": "Royal Fortune",
   "SPACESHIP_PIRATE_ROYAL_FORTUNE_HERO_DESCRIPTION": "Royal Fortune, commanded by the infamous Captain Blackbeard, is a ship that has become a legend among pirates and a fear for intergalactic commerce. With an imposing design and loaded with powerful weapons, this ship has witnessed and starred in some of the boldest pirate victories. Its ability to appear where least expected makes it a constant threat in the busiest trade corridors.",
   "SPACESHIP_PIRATE_THE_STELLAR_SPECTRE_HERO_NAME": "The Stellar Spectre",
-  "SPACESHIP_PIRATE_THE_STELLAR_SPECTRE_HERO_DESCRIPTION": "The Stellar Spectre, a ship shrouded in mystery and ancient technology, uses camouflage systems that render it nearly invisible. Legend has it that it operates from cosmic dust clouds, swooping down on merchant fleets without warning. Its ability to strike from concealment and vanish before a response can be organized makes The Stellar Spectre one of the most feared and respected ships in the galaxy."
+  "SPACESHIP_PIRATE_THE_STELLAR_SPECTRE_HERO_DESCRIPTION": "The Stellar Spectre, a ship shrouded in mystery and ancient technology, uses camouflage systems that render it nearly invisible. Legend has it that it operates from cosmic dust clouds, swooping down on merchant fleets without warning. Its ability to strike from concealment and vanish before a response can be organized makes The Stellar Spectre one of the most feared and respected ships in the galaxy.",
+
+  "EXPLORE_FLEET_TYPE": "Explore planet"
 }
diff --git a/packages/frontend/src/translations/spanish.json b/packages/frontend/src/translations/spanish.json
index 4671ecd..902c1d0 100644
--- a/packages/frontend/src/translations/spanish.json
+++ b/packages/frontend/src/translations/spanish.json
@@ -193,10 +193,10 @@
   "TROOP_PIRATE_CORSAIR_DESCRIPTION": "Los Corsarios Piratas son la élite de la flota pirata, promovidos por su crueldad y astucia en batalla. Equipados con armamento avanzado y dispositivos de camuflaje espacial, estos comandantes son temibles en combate directo y operaciones encubiertas. Su presencia en el campo de batalla garantiza el caos entre las filas enemigas, desmantelando defensas y capturando naves con una eficiencia brutal",
   "SPACESHIP_PIRATE_RECON_DRONE_NAME": "Sonda de espionaje",
   "SPACESHIP_PIRATE_RECON_DRONE_DESCRIPTION": "La sonda de espionaje pirata es una unidad esencial pero discreta, diseñada para la recolección sigilosa de información. Dotada de tecnología de ocultamiento avanzada, esta sonda puede infiltrarse en territorios enemigos sin ser detectada, proporcionando datos cruciales sobre las posiciones y movimientos de adversarios, preparando el terreno para futuros asaltos y saqueos",
+  "SPACESHIP_PIRATE_SCRAP_FIGHTER_NAME": "Caza chatarra Pirata",
+  "SPACESHIP_PIRATE_SCRAP_FIGHTER_DESCRIPTION": "El Interceptor Pirata es una nave diseñada específicamente para el combate táctico contra cazas enemigos. Rápido y ágil, este caza está equipado con sistemas de armas avanzadas, extraídas y reconfiguradas de derribos anteriores. Ideal para emboscadas y ataques rápidos, el Interceptor Pirata se especializa en neutralizar las escoltas de cazas que protegen las flotas mercantes espaciales. Su capacidad para infiltrarse y atacar con precisión lo convierte en una amenaza formidable para cualquier formación de defensa ligera.",
   "SPACESHIP_PIRATE_STAR_FIGHTER_NAME": "Caza pirata",
   "SPACESHIP_PIRATE_STAR_FIGHTER_DESCRIPTION": "El Caza Pirata es una nave robusta y heterogénea, ensamblada a partir de partes y sistemas robados de otras razas. Estas naves, lejos de destacar por su elegancia o tecnología avanzada, brillan por su resistencia y adaptabilidad en el combate. Equipados con una mezcla de armamentos improvisados, los Cazas Piratas son impredecibles en batalla, capaces de sorprender a enemigos que subestiman su eficacia. Además, partes de sus componentes originales han sido retiradas para hacer sitio a compartimentos secretos diseñados para el transporte de carga de contrabando, ofreciendo una capacidad de carga excepcional a costa de menores prestaciones en ataque y defensa.",
-  "SPACESHIP_PIRATE_INTERCEPTOR_NAME": "Interceptor Pirata",
-  "SPACESHIP_PIRATE_INTERCEPTOR_DESCRIPTION": "El Interceptor Pirata es una nave diseñada específicamente para el combate táctico contra cazas enemigos. Rápido y ágil, este caza está equipado con sistemas de armas avanzadas, extraídas y reconfiguradas de derribos anteriores. Ideal para emboscadas y ataques rápidos, el Interceptor Pirata se especializa en neutralizar las escoltas de cazas que protegen las flotas mercantes espaciales. Su capacidad para infiltrarse y atacar con precisión lo convierte en una amenaza formidable para cualquier formación de defensa ligera.",
   "SPACESHIP_PIRATE_CRUISER_NAME": "Crucero espacial Pirata",
   "SPACESHIP_PIRATE_CRUISER_DESCRIPTION": "El Crucero Espacial Pirata es una nave de mayor tamaño, diseñada para incursiones de profundidad en territorios poco defendidos. Con capacidad para albergar un pequeño grupo de piratas, este crucero es frecuentemente utilizado por saqueadores que atacan núcleos de población comerciante en planetas y sistemas alejados. Armado con cañones de asalto y sistemas de abordaje rápido, permite a los piratas lanzar ataques sorpresa, saquear recursos y retirarse antes de que las fuerzas de defensa puedan responder. Su estructura reforzada y sistemas de ocultamiento mejorados aseguran una entrada y salida eficaz, convirtiéndolo en el vehículo perfecto para operaciones de golpe y fuga.",
   "SPACESHIP_PIRATE_FRIGATE_NAME": "Fragata Pirata",
@@ -221,5 +221,7 @@
   "SPACESHIP_PIRATE_ROYAL_FORTUNE_HERO_NAME": "Royal Fortune",
   "SPACESHIP_PIRATE_ROYAL_FORTUNE_HERO_DESCRIPTION": "Royal Fortune, comandada por el infame capitán Barbanegra, es una nave que se ha convertido en una leyenda entre los piratas y un temor para el comercio intergaláctico. Con un diseño imponente y cargada de armas poderosas, esta nave ha sido testigo y protagonista de algunas de las más audaces victorias piratas. Su habilidad para aparecer donde menos se la espera la hace una amenaza constante en los corredores comerciales más transitados.",
   "SPACESHIP_PIRATE_THE_STELLAR_SPECTRE_HERO_NAME": "The Stellar Spectre",
-  "SPACESHIP_PIRATE_THE_STELLAR_SPECTRE_HERO_DESCRIPTION": "The Stellar Spectre, una nave envuelta en misterio y antigua tecnología, utiliza sistemas de camuflaje que la hacen prácticamente invisible. Según las leyendas, opera desde nubes de polvo cósmico, lanzándose sobre flotas comerciales sin previo aviso. Su capacidad de atacar desde la ocultación y desaparecer antes de que se pueda organizar una respuesta convierte a The Stellar Spectre en una de las naves más temidas y respetadas en la galaxia."
+  "SPACESHIP_PIRATE_THE_STELLAR_SPECTRE_HERO_DESCRIPTION": "The Stellar Spectre, una nave envuelta en misterio y antigua tecnología, utiliza sistemas de camuflaje que la hacen prácticamente invisible. Según las leyendas, opera desde nubes de polvo cósmico, lanzándose sobre flotas comerciales sin previo aviso. Su capacidad de atacar desde la ocultación y desaparecer antes de que se pueda organizar una respuesta convierte a The Stellar Spectre en una de las naves más temidas y respetadas en la galaxia.",
+
+  "EXPLORE_FLEET_TYPE": "Explorar planeta"
 }
diff --git a/packages/frontend/src/utils/getImage.ts b/packages/frontend/src/utils/getImage.ts
index f0b2515..f69ae3f 100644
--- a/packages/frontend/src/utils/getImage.ts
+++ b/packages/frontend/src/utils/getImage.ts
@@ -21,7 +21,7 @@ const unitImages: Record<string, string> = {
   // spaceships
   SPACESHIP_PIRATE_RECON_DRONE_NAME: '/units/pirates/spaceships/pirate_recon_drone_unit.jpeg',
   SPACESHIP_PIRATE_STAR_FIGHTER_NAME: '/units/pirates/spaceships/pirate_star_fighter_unit.jpeg',
-  SPACESHIP_PIRATE_INTERCEPTOR_NAME: '/units/pirates/spaceships/pirate_interceptor_unit.jpeg',
+  SPACESHIP_PIRATE_SCRAP_FIGHTER_NAME: '/units/pirates/spaceships/pirate_scrap_fighter_unit.jpeg',
   SPACESHIP_PIRATE_CRUISER_NAME: '/units/pirates/spaceships/pirate_cruiser_unit.jpeg',
   SPACESHIP_PIRATE_BRIGANTINE_NAME: '/units/pirates/spaceships/pirate_brigantine_unit.jpeg',
   SPACESHIP_PIRATE_IMPERIAL_CORSAIR_FRIGATE_NAME:
diff --git a/packages/game-api-microservice/src/configuration/Database.ts b/packages/game-api-microservice/src/configuration/Database.ts
index 346fc6b..b0a9b15 100644
--- a/packages/game-api-microservice/src/configuration/Database.ts
+++ b/packages/game-api-microservice/src/configuration/Database.ts
@@ -6,6 +6,7 @@ import 'game-engine/dist/models/PlayerModel'
 import 'game-engine/dist/models/RaceModel'
 import 'game-engine/dist/models/UnitModel'
 import 'game-engine/dist/models/FleetModel'
+import 'game-engine/dist/models/PlayerUnitsModel'
 
 const { MONGO_USERNAME, MONGO_PASSWORD, MONGO_PORT, MONGO_GAME_DB } = process.env
 
diff --git a/packages/game-api-microservice/src/controllers/fleetController.ts b/packages/game-api-microservice/src/controllers/fleetController.ts
new file mode 100644
index 0000000..6f0428f
--- /dev/null
+++ b/packages/game-api-microservice/src/controllers/fleetController.ts
@@ -0,0 +1,78 @@
+import { FastifyReply, FastifyRequest } from 'fastify'
+import StatusCodes from 'http-status-codes'
+import Joi from 'joi'
+
+// TODO: check package.json
+import validateInputData from 'auth-microservice/dist/utils/validateInputData'
+import handleErrorResponse from 'auth-microservice/dist/errors/handleErrorResponse'
+import { checkSessionToken, getJWTFromAuthHeader } from 'auth-microservice/dist/lib/jwt'
+import {
+  GALAXIES,
+  PLANETS_PER_SYSTEM,
+  SECTORS_PER_GALAXIES,
+  SYSTEM_PER_SECTORS
+} from 'game-engine/dist/types/IPlanet'
+
+import fleetService from '../services/fleetService'
+import { ExplorePlanetData } from '../types/Fleets'
+
+const explorePlanetFleetValidationSchema = Joi.object<ExplorePlanetData>({
+  universeName: Joi.string().required(),
+  toPlanetCoordinates: Joi.object({
+    galaxy: Joi.number().integer().min(1).max(GALAXIES).required(),
+    sector: Joi.number().integer().min(1).max(SECTORS_PER_GALAXIES).required(),
+    system: Joi.number().integer().min(1).max(SYSTEM_PER_SECTORS).required(),
+    planet: Joi.number().integer().min(1).max(PLANETS_PER_SYSTEM).required()
+  }),
+
+  fromPlanetCoordinates: Joi.object({
+    galaxy: Joi.number().integer().min(1).max(GALAXIES).required(),
+    sector: Joi.number().integer().min(1).max(SECTORS_PER_GALAXIES).required(),
+    system: Joi.number().integer().min(1).max(SYSTEM_PER_SECTORS).required(),
+    planet: Joi.number().integer().min(1).max(PLANETS_PER_SYSTEM).required()
+  }),
+  fleetUnits: Joi.array()
+    .items(
+      Joi.object({
+        unitName: Joi.string().required(),
+        amount: Joi.number().integer().min(1).required()
+      })
+    )
+    .min(1)
+    .required(),
+
+  executeTaskAt: Joi.number().optional()
+})
+
+async function explorePlanet(request: FastifyRequest, response: FastifyReply) {
+  try {
+    await validateInputData(request.body, explorePlanetFleetValidationSchema)
+
+    const jwtToken = getJWTFromAuthHeader(request.headers.authorization)
+
+    const { username } = checkSessionToken(jwtToken)
+
+    const { fromPlanetCoordinates, toPlanetCoordinates, universeName, fleetUnits } =
+      request.body as ExplorePlanetData
+
+    const newExplorePlanetTask = await fleetService.explorePlanet({
+      username,
+      universeName,
+      fromPlanetCoordinates,
+      toPlanetCoordinates,
+      fleetUnits
+    })
+
+    response.code(StatusCodes.CREATED).send(newExplorePlanetTask)
+  } catch (error) {
+    const { code, body } = handleErrorResponse(error)
+
+    return response.code(code).send(body)
+  }
+}
+
+const fleetController = {
+  explorePlanet
+}
+
+export default fleetController
diff --git a/packages/game-api-microservice/src/controllers/galaxyController.ts b/packages/game-api-microservice/src/controllers/galaxyController.ts
new file mode 100644
index 0000000..c113dcb
--- /dev/null
+++ b/packages/game-api-microservice/src/controllers/galaxyController.ts
@@ -0,0 +1,42 @@
+import { FastifyReply, FastifyRequest } from 'fastify'
+import StatusCodes from 'http-status-codes'
+
+import handleErrorResponse from 'auth-microservice/dist/errors/handleErrorResponse'
+import { checkSessionToken, getJWTFromAuthHeader } from 'auth-microservice/dist/lib/jwt'
+
+import galaxyService from '../services/galaxyService'
+
+async function getGalaxy(request: FastifyRequest, response: FastifyReply) {
+  try {
+    const { galaxy, sector, system, universeName } = request.query as {
+      galaxy: string
+      sector: string
+      system: string
+      universeName: string
+    }
+
+    const jwtToken = getJWTFromAuthHeader(request.headers.authorization)
+
+    const { username } = checkSessionToken(jwtToken)
+
+    const coordinates = {
+      galaxy,
+      sector,
+      system
+    }
+
+    const planets = await galaxyService.getGalaxy(username, universeName, coordinates)
+
+    response.code(StatusCodes.OK).send(planets)
+  } catch (error) {
+    const { code, body } = handleErrorResponse(error)
+
+    return response.code(code).send(body)
+  }
+}
+
+const galaxyController = {
+  getGalaxy
+}
+
+export default galaxyController
diff --git a/packages/game-api-microservice/src/routes/FleetRoutes.ts b/packages/game-api-microservice/src/routes/FleetRoutes.ts
new file mode 100644
index 0000000..d4fb82a
--- /dev/null
+++ b/packages/game-api-microservice/src/routes/FleetRoutes.ts
@@ -0,0 +1,20 @@
+import { Route } from '../configuration/Server'
+import { EXPLORE_PLANET_FLEET_PATH } from './constants'
+import fleetController from '../controllers/fleetController'
+
+const explorePlanetRoute: Route = {
+  url: EXPLORE_PLANET_FLEET_PATH,
+  method: 'POST',
+  handler: fleetController.explorePlanet
+}
+
+// TODO: implement get fleet fleets
+// const getPlayerFleetsRoute: Route = {
+//   url: FLEET_PATH,
+//   method: 'GET',
+//   handler: fleetController.getPlayerFleets
+// }
+
+const fleetRoutes = [explorePlanetRoute]
+
+export default fleetRoutes
diff --git a/packages/game-api-microservice/src/routes/constants.ts b/packages/game-api-microservice/src/routes/constants.ts
index f204c37..15ab1c6 100644
--- a/packages/game-api-microservice/src/routes/constants.ts
+++ b/packages/game-api-microservice/src/routes/constants.ts
@@ -5,3 +5,8 @@ export const RESEARCH_PATH = '/research'
 export const RESEARCH_QUEUE_PATH = `${RESEARCH_PATH}/queue`
 export const BUILD_UNITS_PATH = '/units'
 export const BUILD_UNITS_QUEUE_PATH = `${BUILD_UNITS_PATH}/queue`
+export const GALAXY_PATH = '/galaxy'
+
+export const FLEET_PATH = '/fleet'
+
+export const EXPLORE_PLANET_FLEET_PATH = `${FLEET_PATH}/explorePlanet`
diff --git a/packages/game-api-microservice/src/routes/galaxyRoutes.ts b/packages/game-api-microservice/src/routes/galaxyRoutes.ts
new file mode 100644
index 0000000..36f7bd9
--- /dev/null
+++ b/packages/game-api-microservice/src/routes/galaxyRoutes.ts
@@ -0,0 +1,13 @@
+import { Route } from '../configuration/Server'
+import galaxyController from '../controllers/galaxyController'
+import { GALAXY_PATH } from './constants'
+
+const getGalaxyRoute: Route = {
+  url: GALAXY_PATH,
+  method: 'GET',
+  handler: galaxyController.getGalaxy
+}
+
+const galaxyRoutes = [getGalaxyRoute]
+
+export default galaxyRoutes
diff --git a/packages/game-api-microservice/src/routes/gameApiRoutes.ts b/packages/game-api-microservice/src/routes/gameApiRoutes.ts
index 931df71..1f261ca 100644
--- a/packages/game-api-microservice/src/routes/gameApiRoutes.ts
+++ b/packages/game-api-microservice/src/routes/gameApiRoutes.ts
@@ -1,15 +1,20 @@
+import { Route } from '../configuration/Server'
 import playerRoutes from './playerRoutes'
 import researchRoutes from './researchRoutes'
 import buildUnitsRoutes from './buildUnitsRoutes'
 import gameInfoRoutes from './gameInfoRoutes'
 import taskRoutes from './taskRoutes'
+import galaxyRoutes from './galaxyRoutes'
+import fleetRoutes from './FleetRoutes'
 
-const gameApiRoutes = [
+const gameApiRoutes: Route[] = [
   ...playerRoutes,
   ...researchRoutes,
   ...buildUnitsRoutes,
   ...gameInfoRoutes,
-  ...taskRoutes
+  ...taskRoutes,
+  ...galaxyRoutes,
+  ...fleetRoutes
 ]
 
 export default gameApiRoutes
diff --git a/packages/game-api-microservice/src/services/buildUnitsService.ts b/packages/game-api-microservice/src/services/buildUnitsService.ts
index a6f71ea..b8f98fd 100644
--- a/packages/game-api-microservice/src/services/buildUnitsService.ts
+++ b/packages/game-api-microservice/src/services/buildUnitsService.ts
@@ -2,6 +2,8 @@ import playerRepository from 'game-engine/dist/repositories/playerRepository'
 import taskRepository from 'game-engine/dist/repositories/taskRepository'
 import universeRepository from 'game-engine/dist/repositories/universeRepository'
 import planetRepository from 'game-engine/dist/repositories/planetRepository'
+import fleetRepository from 'game-engine/dist/repositories/fleetRepository'
+import playerUnitsRepository from 'game-engine/dist/repositories/playerUnitsRepository'
 import createStartBuildUnitsTask from 'game-engine/dist/engine/tasks/utils/createStartBuildUnitsTask'
 import NotFoundError from 'auth-microservice/dist/errors/NotFoundError'
 import BadRequestError from 'auth-microservice/dist/errors/BadRequestError'
@@ -179,7 +181,10 @@ async function updateBuildUnitsQueue({
 
   await planet.save()
 
-  return { player: cleanPlayerFields(player) }
+  const fleets = await fleetRepository.findFleetsByPlayerId(player._id.toString())
+  const playerUnits = await playerUnitsRepository.findPlayerUnits(player._id.toString())
+
+  return { player: cleanPlayerFields(player, fleets, playerUnits) }
 }
 
 const buildUnitsService = {
diff --git a/packages/game-api-microservice/src/services/fleetService.ts b/packages/game-api-microservice/src/services/fleetService.ts
new file mode 100644
index 0000000..d98d2f6
--- /dev/null
+++ b/packages/game-api-microservice/src/services/fleetService.ts
@@ -0,0 +1,97 @@
+import createStartFleetTask from 'game-engine/dist/engine/tasks/utils/createStartFleetTask'
+import universeRepository from 'game-engine/dist/repositories/universeRepository'
+import playerRepository from 'game-engine/dist/repositories/playerRepository'
+import planetRepository from 'game-engine/dist/repositories/planetRepository'
+import unitRepository from 'game-engine/dist/repositories/unitRepository'
+import taskRepository from 'game-engine/dist/repositories/taskRepository'
+import { FleetTypes } from 'game-engine/dist/types/IFleet'
+import NotFoundError from 'auth-microservice/dist/errors/NotFoundError'
+
+import { PlanetCoordinatesType } from '../types/Planet'
+import cleanTaskFields from '../utils/cleanTaskFields'
+
+type explorePlanetServiceData = {
+  username: string
+  fleetUnits: { unitName: string; amount: number }[]
+  universeName: string
+  fromPlanetCoordinates: PlanetCoordinatesType
+  toPlanetCoordinates: PlanetCoordinatesType
+  executeTaskAt?: number
+}
+
+async function explorePlanet({
+  username,
+  fleetUnits,
+  universeName,
+  fromPlanetCoordinates,
+  toPlanetCoordinates,
+  executeTaskAt
+}: explorePlanetServiceData) {
+  const universe = await universeRepository.findUniverseByName(universeName)
+
+  if (!universe) {
+    throw new NotFoundError('invalid universe', { universeName })
+  }
+
+  const universeId = universe._id.toString()
+
+  const player = await playerRepository.findPlayerByUsername(username, universeId)
+
+  if (!player) {
+    throw new NotFoundError('invalid player', { username, universeName })
+  }
+
+  const fromPlanet = await planetRepository.findPlanetByCoordinates(fromPlanetCoordinates)
+
+  if (!fromPlanet) {
+    throw new NotFoundError('invalid from planet', {
+      username,
+      fromPlanetCoordinates
+    })
+  }
+
+  const toPlanet = await planetRepository.findPlanetByCoordinates(toPlanetCoordinates)
+
+  if (!toPlanet) {
+    throw new NotFoundError('invalid to planet', {
+      username,
+      toPlanetCoordinates
+    })
+  }
+
+  const units = await unitRepository.findUnits()
+
+  const fleetUnitsWithIds = fleetUnits.map(({ unitName, amount }) => {
+    const unit = units.find((unit) => unit.name === unitName)
+
+    if (!unit) {
+      throw new NotFoundError('invalid unit', { unitName })
+    }
+
+    return {
+      unit,
+      amount
+    }
+  })
+
+  const fleetData = {
+    playerId: player._id.toString(),
+    fromPlanetId: fromPlanet._id.toString(),
+    toPlanetId: toPlanet._id.toString(),
+    units: fleetUnitsWithIds,
+    resources: 0,
+    fleetType: 'EXPLORE_FLEET_TYPE' as FleetTypes
+  }
+
+  const startFleeTask = createStartFleetTask(universeId, fleetData, executeTaskAt)
+
+  const newTask = await taskRepository.createStartFleetTask(startFleeTask)
+
+  return { task: cleanTaskFields(newTask) }
+}
+
+const fleetService = {
+  explorePlanet
+}
+
+export default fleetService
diff --git a/packages/game-api-microservice/src/services/galaxyService.ts b/packages/game-api-microservice/src/services/galaxyService.ts
new file mode 100644
index 0000000..edf57ba
--- /dev/null
+++ b/packages/game-api-microservice/src/services/galaxyService.ts
@@ -0,0 +1,54 @@
+import universeRepository from 'game-engine/dist/repositories/universeRepository'
+import playerRepository from 'game-engine/dist/repositories/playerRepository'
+import planetRepository from 'game-engine/dist/repositories/planetRepository'
+import { GALAXIES, SECTORS_PER_GALAXIES, SYSTEM_PER_SECTORS } from 'game-engine/dist/types/IPlanet'
+import NotFoundError from 'auth-microservice/dist/errors/NotFoundError'
+import BadRequestError from 'auth-microservice/dist/errors/BadRequestError'
+
+import cleanPlanetFields from '../utils/cleanPlanetFields'
+
+type Coordinates = {
+  galaxy: string
+  sector: string
+  system: string
+}
+
+async function getGalaxy(username: string, universeName: string, coordinates: Coordinates) {
+  const galaxy = Number(coordinates.galaxy)
+  const sector = Number(coordinates.sector)
+  const system = Number(coordinates.system)
+
+  const isValidGalaxy = galaxy > 0 && galaxy <= GALAXIES
+  const isValidSector = sector > 0 && sector <= SECTORS_PER_GALAXIES
+  const isValidSystem = system > 0 && system <= SYSTEM_PER_SECTORS
+
+  if (!isValidGalaxy || !isValidSector || !isValidSystem || !universeName) {
+    throw new BadRequestError('invalid coordinates', { universeName, galaxy, sector, system })
+  }
+
+  const universe = await universeRepository.findUniverseByName(universeName)
+
+  if (!universe) {
+    throw new NotFoundError('invalid universe', { universeName })
+  }
+
+  const universeId = universe._id.toString()
+
+  const player = await playerRepository.findPlayerByUsername(username, universeId)
+
+  if (!player) {
+    throw new NotFoundError('invalid player', { username, universeName })
+  }
+
+  const planets = await planetRepository.findPlanetsBySystem(galaxy, sector, system)
+
+  return {
+    planets: planets.map((planet) => cleanPlanetFields(planet, player))
+  }
+}
+
+const galaxyService = {
+  getGalaxy
+}
+
+export default galaxyService
diff --git a/packages/game-api-microservice/src/services/playerService.ts b/packages/game-api-microservice/src/services/playerService.ts
index e181c8a..2460d63 100644
--- a/packages/game-api-microservice/src/services/playerService.ts
+++ b/packages/game-api-microservice/src/services/playerService.ts
@@ -2,6 +2,8 @@ import playerRepository from 'game-engine/dist/repositories/playerRepository'
 import taskRepository from 'game-engine/dist/repositories/taskRepository'
 import raceRepository from 'game-engine/dist/repositories/raceRepository'
 import universeRepository from 'game-engine/dist/repositories/universeRepository'
+import playerUnitsRepository from 'game-engine/dist/repositories/playerUnitsRepository'
+import fleetRepository from 'game-engine/dist/repositories/fleetRepository'
 import { ITask } from 'game-engine/dist/types/ITask'
 import NotFoundError from 'auth-microservice/dist/errors/NotFoundError'
 import ConflictError from 'auth-microservice/dist/errors/ConflictError'
@@ -96,7 +98,10 @@ async function getPlayer(username: string, universeName: string): Promise<getPla
 
   // TODO: add future pending tasks to tack them in the frontend
 
-  return { player: cleanPlayerFields(player) }
+  const fleets = await fleetRepository.findFleetsByPlayerId(player._id.toString())
+  const playerUnits = await playerUnitsRepository.findPlayerUnits(player._id.toString())
+
+  return { player: cleanPlayerFields(player, fleets, playerUnits) }
 }
 
 const playerService = {
diff --git a/packages/game-api-microservice/src/services/researchService.ts b/packages/game-api-microservice/src/services/researchService.ts
index b5b8b25..907ec0b 100644
--- a/packages/game-api-microservice/src/services/researchService.ts
+++ b/packages/game-api-microservice/src/services/researchService.ts
@@ -1,6 +1,8 @@
 import playerRepository from 'game-engine/dist/repositories/playerRepository'
 import taskRepository from 'game-engine/dist/repositories/taskRepository'
 import universeRepository from 'game-engine/dist/repositories/universeRepository'
+import fleetRepository from 'game-engine/dist/repositories/fleetRepository'
+import playerUnitsRepository from 'game-engine/dist/repositories/playerUnitsRepository'
 import createStartResearchTask from 'game-engine/dist/engine/tasks/utils/createStartResearchTask'
 import NotFoundError from 'auth-microservice/dist/errors/NotFoundError'
 import BadRequestError from 'auth-microservice/dist/errors/BadRequestError'
@@ -108,7 +110,10 @@ async function updateResearchQueue({
 
   await player.save()
 
-  return { player: cleanPlayerFields(player) }
+  const fleets = await fleetRepository.findFleetsByPlayerId(player._id.toString())
+  const playerUnits = await playerUnitsRepository.findPlayerUnits(player._id.toString())
+
+  return { player: cleanPlayerFields(player, fleets, playerUnits) }
 }
 
 const researchService = {
diff --git a/packages/game-api-microservice/src/types/Fleets.ts b/packages/game-api-microservice/src/types/Fleets.ts
index bb5c316..40779f4 100644
--- a/packages/game-api-microservice/src/types/Fleets.ts
+++ b/packages/game-api-microservice/src/types/Fleets.ts
@@ -1,25 +1,44 @@
-import { PlanetType } from './Planet'
+import { PlanetCoordinatesType, PlanetType } from './Planet'
+import { StartFleetTaskType, TaskType } from './Task'
 import { UnitType } from './Unit'
 
-interface FleetUnitsType {
+export interface FleetUnitsType {
   unit: UnitType
   amount: number
 }
 
-interface TravelFleetType {
-  destination: PlanetType
-  arriveAt: number
-  fleetType: string // TODO: create a fleetType
-  isReturning: boolean
-  resources: number
-}
+export type ExploreFleetType = 'EXPLORE_FLEET_TYPE'
+
+export type FleetTypes = ExploreFleetType
 
 export interface FleetType {
+  playerId: string
+
   units: FleetUnitsType[]
 
-  playerId: string
+  isReturning: boolean
+  isFinished: boolean
 
-  planet: PlanetType
+  fromPlanet: PlanetType
+  toPlanet: PlanetType
 
-  travel?: TravelFleetType
+  arriveAt: number
+  startedAt: number
+  duration: number
+  fleetType: FleetTypes
+  resources: number
+  taskId?: string
 }
+
+export type ExplorePlanetData = {
+  universeName: string
+  fromPlanetCoordinates: PlanetCoordinatesType
+  toPlanetCoordinates: PlanetCoordinatesType
+  fleetUnits: {
+    unitName: string
+    amount: number
+  }[]
+  executeTaskAt?: number
+}
+
+export type explorePlanetFleetResponseType = { task: TaskType<StartFleetTaskType> }
diff --git a/packages/game-api-microservice/src/types/Planet.ts b/packages/game-api-microservice/src/types/Planet.ts
index 7235b70..027cf45 100644
--- a/packages/game-api-microservice/src/types/Planet.ts
+++ b/packages/game-api-microservice/src/types/Planet.ts
@@ -46,5 +46,9 @@ export type PlanetType = {
     }
   }
 
+  exploredBy: []
+
   units: UnitType[]
 }
+
+export type getGalaxyResponseType = { planets: PlanetType[] }
diff --git a/packages/game-api-microservice/src/types/Player.ts b/packages/game-api-microservice/src/types/Player.ts
index f98106d..f682d37 100644
--- a/packages/game-api-microservice/src/types/Player.ts
+++ b/packages/game-api-microservice/src/types/Player.ts
@@ -5,6 +5,7 @@ import { RaceType } from './Race'
 import { ResearchType } from './Research'
 import { NewPlayerTaskType, TaskType } from './Task'
 import { FleetType } from './Fleets'
+import { PlayerUnitsType } from './PlayerUnits'
 
 export type PlayerPerkType = {
   bonus: IBonus
@@ -31,18 +32,25 @@ export type PlayerType = {
     principal: PlanetType
     colonies: PlanetType[]
   }
+
   perks: PlayerPerkType[]
+
   researches: {
     researched: PlayerResearchType[]
+
+    queue: string[]
+
     activeResearch?: {
       research: ResearchType
       level: number
       executeTaskAt: number
       taskId: string
     }
-    queue: string[]
   }
+
   fleets: FleetType[]
+
+  units: PlayerUnitsType[]
 }
 
 export type PlayerData = {
diff --git a/packages/game-api-microservice/src/types/PlayerUnits.ts b/packages/game-api-microservice/src/types/PlayerUnits.ts
new file mode 100644
index 0000000..440a219
--- /dev/null
+++ b/packages/game-api-microservice/src/types/PlayerUnits.ts
@@ -0,0 +1,14 @@
+import { PlanetType } from './Planet'
+import { PlayerType } from './Player'
+import { UnitType } from './Unit'
+
+export interface PlanetUnitsType {
+  unit: UnitType
+  amount: number
+}
+
+export type PlayerUnitsType = {
+  player: PlayerType
+  units: PlanetUnitsType[]
+  planet: PlanetType
+}
diff --git a/packages/game-api-microservice/src/types/Task.ts b/packages/game-api-microservice/src/types/Task.ts
index e37c39d..34d370e 100644
--- a/packages/game-api-microservice/src/types/Task.ts
+++ b/packages/game-api-microservice/src/types/Task.ts
@@ -1,3 +1,4 @@
+import { FleetType, FleetUnitsType } from './Fleets'
 import { UnitTypes } from './Unit'
 
 export const PENDING_TASK_STATUS = 'PENDING'
@@ -61,12 +62,43 @@ export type FinishBuildUnitsTaskData = {
   }
 }
 
+export const START_FLEET_TASK_TYPE = 'START_FLEET_UNITS_TASK'
+export type StartFleetTaskType = typeof START_FLEET_TASK_TYPE
+export type StartFleetTaskData = {
+  playerId: string
+  fromPlanetId: string
+  toPlanetId: string
+  units: FleetUnitsType[]
+  resources: number
+  fleetType: FleetType
+  allUnitsInThePlanet?: boolean
+  allResourcesInThePlanet?: boolean
+}
+
+export const FINISH_FLEET_TASK_TYPE = 'FINISH_FLEET_UNITS_TASK'
+export type FinishFleetTaskType = typeof FINISH_FLEET_TASK_TYPE
+export type FinishFleetTaskData = {
+  playerId: string
+  fromPlanetId: string
+  toPlanetId: string
+  units: FleetUnitsType[]
+  resources: number
+  fleetType: FleetType
+  allUnitsInThePlanet?: boolean
+  allResourcesInThePlanet?: boolean
+  isReturning: boolean
+  arriveAt: number
+  fleetId: string
+}
+
 export type TaskTypesTypes =
   | NewPlayerTaskType
   | StartResearchTaskType
   | FinishResearchTaskType
   | StartBuildUnitsTaskType
   | FinishBuildUnitsTaskType
+  | StartFleetTaskType
+  | FinishFleetTaskType
 
 export type TaskData<T extends TaskTypesTypes> = T extends NewPlayerTaskType
   ? NewPlayerTaskData
@@ -78,7 +110,11 @@ export type TaskData<T extends TaskTypesTypes> = T extends NewPlayerTaskType
         ? StartBuildUnitsTaskData
         : T extends FinishBuildUnitsTaskType
           ? FinishBuildUnitsTaskData
-          : never
+          : T extends StartFleetTaskType
+            ? StartFleetTaskData
+            : T extends FinishFleetTaskType
+              ? FinishFleetTaskData
+              : never
 
 export type HistoryStatusItemType = {
   taskStatus: TaskStatus
diff --git a/packages/game-api-microservice/src/types/Unit.ts b/packages/game-api-microservice/src/types/Unit.ts
index 4162cb6..b04ee50 100644
--- a/packages/game-api-microservice/src/types/Unit.ts
+++ b/packages/game-api-microservice/src/types/Unit.ts
@@ -21,21 +21,20 @@ type UnitStatsTypes = {
   troopsCapacity: number
 }
 
-// TODO: avoid duplicates?
-
-// TODO: troops subtypes
+// troops
 type UnitTroopInfantrySubtype = 'INFANTRY'
 type UnitTroopMedicSubtype = 'MEDIC'
 
-// TODO: spaceship subtypes
+// spaceship
 type UnitSpaceshipProbeSubtype = 'PROBE'
 type UnitSpaceshipStarFighterSubtype = 'STAR_FIGHTER'
-// TODO: Implement the INTERCEPTOR_STAR_FIGHTER subtype to be effective against other StarFighters and less effective against other unit types.
 type UnitSpaceshipCruiserSubtype = 'CRUISER'
 type UnitSpaceshipFrigateSubtype = 'FRIGATE'
+type UnitSpaceshipDestroyerSubtype = 'DESTROYER'
+type UnitSpaceshipCarrierSubtype = 'CARRIER'
 type UnitSpaceshipBattleStationSubtype = 'BATTLE_STATION'
 
-// TODO: defenses subtypes
+// defenses
 type UnitDefenseSubtype = 'DEFENSE'
 
 type UnitSubtypes =
@@ -45,6 +44,8 @@ type UnitSubtypes =
   | UnitSpaceshipStarFighterSubtype
   | UnitSpaceshipCruiserSubtype
   | UnitSpaceshipFrigateSubtype
+  | UnitSpaceshipDestroyerSubtype
+  | UnitSpaceshipCarrierSubtype
   | UnitSpaceshipBattleStationSubtype
   | UnitDefenseSubtype
 
diff --git a/packages/game-api-microservice/src/utils/cleanFleetFields.ts b/packages/game-api-microservice/src/utils/cleanFleetFields.ts
index 7fa3ab1..adaa127 100644
--- a/packages/game-api-microservice/src/utils/cleanFleetFields.ts
+++ b/packages/game-api-microservice/src/utils/cleanFleetFields.ts
@@ -1,28 +1,45 @@
 import { IFleetDocument } from 'game-engine/models/FleetModel'
+import { IPlayerDocument } from 'game-engine/models/PlayerModel'
 
 import { FleetType } from '../types/Fleets'
 import cleanUnitFields from './cleanUnitFields'
 import cleanPlanetFields from './cleanPlanetFields'
 
-function cleanFleetFields(fleet: IFleetDocument): FleetType {
-  const { units, playerId, planet, travel } = fleet
+function cleanFleetFields(fleet: IFleetDocument, player: IPlayerDocument): FleetType {
+  const {
+    units,
+    isReturning,
+    isFinished,
+    fromPlanet,
+    toPlanet,
+    arriveAt,
+    startedAt,
+    duration,
+    fleetType,
+    resources,
+    taskId
+  } = fleet
 
   return {
+    playerId: fleet.playerId,
+
     units: units.map((fleetUnits) => ({
       amount: fleetUnits.amount,
       unit: cleanUnitFields(fleetUnits.unit)
     })),
-    playerId: playerId.toString(),
-    planet: cleanPlanetFields(planet),
-    travel: travel
-      ? {
-          destination: cleanPlanetFields(travel.destination),
-          arriveAt: travel.arriveAt,
-          fleetType: travel.fleetType,
-          isReturning: travel.isReturning,
-          resources: travel.resources
-        }
-      : undefined
+
+    isReturning,
+    isFinished,
+
+    fromPlanet: cleanPlanetFields(fromPlanet, player),
+    toPlanet: cleanPlanetFields(toPlanet, player),
+
+    arriveAt,
+    startedAt,
+    duration,
+    fleetType,
+    resources,
+    taskId
   }
 }
 
diff --git a/packages/game-api-microservice/src/utils/cleanPlanetFields.ts b/packages/game-api-microservice/src/utils/cleanPlanetFields.ts
index cccba30..6d9cd8e 100644
--- a/packages/game-api-microservice/src/utils/cleanPlanetFields.ts
+++ b/packages/game-api-microservice/src/utils/cleanPlanetFields.ts
@@ -1,9 +1,9 @@
 import { IPlanetDocument } from 'game-engine/models/PlanetModel'
+import { IPlayerDocument } from 'game-engine/models/PlayerModel'
 import { IPlanet } from 'game-engine/types/IPlanet'
-
 import { PlanetType } from '../types/Planet'
 
-function cleanPlanetFields(planet: IPlanetDocument | IPlanet): PlanetType {
+function cleanPlanetFields(planet: IPlanetDocument | IPlanet, player: IPlayerDocument): PlanetType {
   const {
     name,
     universeId,
@@ -17,12 +17,40 @@ function cleanPlanetFields(planet: IPlanetDocument | IPlanet): PlanetType {
     isSpecial,
     isPrincipal,
     isUnderConquer,
-    isExplored,
     specials,
     unitBuild,
-    units
+    units,
+    exploredBy
   } = planet
 
+  const isExplored = exploredBy.some((playerId) => playerId === player._id.toString())
+
+  if (!isExplored) {
+    const UNEXPLORED_PLANET: PlanetType = {
+      name: '',
+      universeId,
+      imgUrl: '/planets/unexplored_planet.jpeg',
+      ownerId: null,
+      colonizedAt: 0,
+      resources: 0,
+      resourceQuality: 0,
+      lastResourceProductionTime: 0,
+      coordinates: planet.coordinates,
+      isSpecial: false,
+      isPrincipal: false,
+      isUnderConquer: false,
+      isExplored: false,
+      specials: [],
+      unitBuild: EMPTY_BUILD_UNITS_QUEUE,
+      units: [],
+      exploredBy: []
+    }
+
+    return UNEXPLORED_PLANET
+  }
+
+  const isPlayerPlanet = player._id.toString() === ownerId
+
   return {
     name,
     universeId,
@@ -38,9 +66,25 @@ function cleanPlanetFields(planet: IPlanetDocument | IPlanet): PlanetType {
     isUnderConquer,
     isExplored,
     specials,
-    unitBuild,
-    units
+    unitBuild: isPlayerPlanet ? unitBuild : EMPTY_BUILD_UNITS_QUEUE,
+    units,
+    exploredBy: []
   }
 }
 
 export default cleanPlanetFields
+
+const EMPTY_BUILD_UNITS_QUEUE = {
+  troops: {
+    activeBuild: undefined,
+    queue: []
+  },
+  spaceships: {
+    activeBuild: undefined,
+    queue: []
+  },
+  defenses: {
+    activeBuild: undefined,
+    queue: []
+  }
+}
diff --git a/packages/game-api-microservice/src/utils/cleanPlayerFields.ts b/packages/game-api-microservice/src/utils/cleanPlayerFields.ts
index 97243e7..4b4e029 100644
--- a/packages/game-api-microservice/src/utils/cleanPlayerFields.ts
+++ b/packages/game-api-microservice/src/utils/cleanPlayerFields.ts
@@ -5,17 +5,24 @@ import cleanPlanetFields from './cleanPlanetFields'
 import cleanRaceFields from './cleanRaceFields'
 import cleanFleetFields from './cleanFleetFields'
 import cleanResearchFields from './cleanResearchFields'
+import { IFleetDocument } from 'game-engine/models/FleetModel'
+import { IPlayerUnits } from 'game-engine/types/IPlayerUnits'
+import cleanUnitFields from './cleanUnitFields'
 
-function cleanPlayerFields(player: IPlayerDocument): PlayerType {
-  const { user, universeId, race, planets, perks, researches, fleets } = player
+function cleanPlayerFields(
+  player: IPlayerDocument,
+  playerFleets: IFleetDocument[],
+  playerUnits: IPlayerUnits[]
+): PlayerType {
+  const { user, universeId, race, planets, perks, researches } = player
 
   return {
     user,
     universeId,
     race: cleanRaceFields(race),
     planets: {
-      principal: cleanPlanetFields(planets.principal),
-      colonies: planets.colonies.map(cleanPlanetFields)
+      principal: cleanPlanetFields(planets.principal, player),
+      colonies: planets.colonies.map((colony) => cleanPlanetFields(colony, player))
     },
     perks,
     researches: {
@@ -33,7 +40,16 @@ function cleanPlayerFields(player: IPlayerDocument): PlayerType {
           }
         : undefined
     },
-    fleets: fleets.map(cleanFleetFields)
+    fleets: playerFleets.map((fleet) => cleanFleetFields(fleet, player)),
+
+    units: playerUnits.map((playerUnits) => ({
+      player: cleanPlayerFields(player, [], []),
+      units: playerUnits.units.map(({ unit, amount }) => ({
+        unit: cleanUnitFields(unit),
+        amount
+      })),
+      planet: cleanPlanetFields(playerUnits.planet, player)
+    }))
   }
 }
 
diff --git a/packages/game-api-microservice/src/utils/cleanTaskFields.ts b/packages/game-api-microservice/src/utils/cleanTaskFields.ts
index f7df9ad..7cd81b1 100644
--- a/packages/game-api-microservice/src/utils/cleanTaskFields.ts
+++ b/packages/game-api-microservice/src/utils/cleanTaskFields.ts
@@ -1,6 +1,6 @@
 import { ITaskDocument } from 'game-engine/models/TaskModel'
 
-import { TaskType, TaskTypesTypes } from '../types/Task'
+import { StartBuildUnitsTaskData, TaskType, TaskTypesTypes } from '../types/Task'
 
 function cleanTaskFields(task: ITaskDocument): TaskType<TaskTypesTypes> {
   const {
@@ -60,11 +60,5 @@ function cleanTaskDataFields(taskData: ITaskDocument['data']): TaskType<TaskType
   }
 
   // StartBuildUnitsTaskType or FinishBuildUnitsTaskType
-  const { playerId, planetId, build } = taskData
-
-  return {
-    build,
-    playerId,
-    planetId
-  }
+  return taskData as StartBuildUnitsTaskData
 }
diff --git a/packages/game-engine/src/assets/units/pirates/pirateUnits.ts b/packages/game-engine/src/assets/units/pirates/pirateUnits.ts
index 343daea..be13f0d 100644
--- a/packages/game-engine/src/assets/units/pirates/pirateUnits.ts
+++ b/packages/game-engine/src/assets/units/pirates/pirateUnits.ts
@@ -386,7 +386,7 @@ const pirateReconDrone: IUnit = {
     attack: 1,
     shield: 0,
     health: 10,
-    speed: 1_000,
+    speed: 10_000,
     cargo: 0,
     starFighterCapacity: 0,
     troopsCapacity: 0
@@ -416,26 +416,26 @@ const pirateReconDrone: IUnit = {
   bonus: {}
 }
 
-// Pirate Star fighter (Spaceship)
-const pirateStarFighter: IUnit = {
-  name: 'SPACESHIP_PIRATE_STAR_FIGHTER_NAME',
-  description: 'SPACESHIP_PIRATE_STAR_FIGHTER_DESCRIPTION',
+// Pirate Scrap Fighter (Spaceship)
+const pirateScrapFighter: IUnit = {
+  name: 'SPACESHIP_PIRATE_SCRAP_FIGHTER_NAME',
+  description: 'SPACESHIP_PIRATE_SCRAP_FIGHTER_DESCRIPTION',
 
   raceName: 'PIRATES_RACE_NAME',
 
   type: 'SPACESHIP',
   subtype: 'STAR_FIGHTER',
 
-  energyCost: 105,
-  resourceCost: 300,
-  buildBaseTime: 300_000,
+  energyCost: 85,
+  resourceCost: 120,
+  buildBaseTime: 80_000,
 
   stats: {
-    attack: 165,
-    shield: 15,
-    health: 260,
-    speed: 45,
-    cargo: 50,
+    attack: 80,
+    shield: 10,
+    health: 200,
+    speed: 50,
+    cargo: 40,
     starFighterCapacity: 0,
     troopsCapacity: 0
   },
@@ -451,12 +451,10 @@ const pirateStarFighter: IUnit = {
 
   requirements: {
     researches: [
-      { level: 3, research: PIRATE_FLEET_ATTACK_RESEARCH },
-      { level: 1, research: PIRATE_FLEET_SHIELD_RESEARCH },
-      { level: 3, research: PIRATE_FLEET_HULL_RESEARCH },
-      { level: 3, research: PIRATE_FLEET_ENERGY_RESEARCH },
-      { level: 4, research: PIRATE_FLEET_BUILDING_RESEARCH },
-      { level: 3, research: PIRATE_FLEET_SPEED_RESEARCH }
+      { level: 1, research: PIRATE_FLEET_ATTACK_RESEARCH },
+      { level: 2, research: PIRATE_FLEET_HULL_RESEARCH },
+      { level: 2, research: PIRATE_FLEET_ENERGY_RESEARCH },
+      { level: 2, research: PIRATE_FLEET_SPEED_RESEARCH }
     ]
   },
 
@@ -465,25 +463,25 @@ const pirateStarFighter: IUnit = {
   bonus: {}
 }
 
-// Pirate Interceptor (Spaceship)
-const pirateInterceptor: IUnit = {
-  name: 'SPACESHIP_PIRATE_INTERCEPTOR_NAME',
-  description: 'SPACESHIP_PIRATE_INTERCEPTOR_DESCRIPTION',
+// Pirate Star fighter (Spaceship)
+const pirateStarFighter: IUnit = {
+  name: 'SPACESHIP_PIRATE_STAR_FIGHTER_NAME',
+  description: 'SPACESHIP_PIRATE_STAR_FIGHTER_DESCRIPTION',
 
   raceName: 'PIRATES_RACE_NAME',
 
   type: 'SPACESHIP',
   subtype: 'STAR_FIGHTER',
 
-  energyCost: 120,
-  resourceCost: 350,
-  buildBaseTime: 350_000,
+  energyCost: 105,
+  resourceCost: 300,
+  buildBaseTime: 300_000,
 
   stats: {
-    attack: 170,
-    shield: 30,
-    health: 290,
-    speed: 50,
+    attack: 165,
+    shield: 15,
+    health: 260,
+    speed: 45,
     cargo: 50,
     starFighterCapacity: 0,
     troopsCapacity: 0
@@ -500,12 +498,12 @@ const pirateInterceptor: IUnit = {
 
   requirements: {
     researches: [
-      { level: 4, research: PIRATE_FLEET_ATTACK_RESEARCH },
-      { level: 2, research: PIRATE_FLEET_SHIELD_RESEARCH },
-      { level: 4, research: PIRATE_FLEET_HULL_RESEARCH },
-      { level: 5, research: PIRATE_FLEET_ENERGY_RESEARCH },
-      { level: 5, research: PIRATE_FLEET_BUILDING_RESEARCH },
-      { level: 6, research: PIRATE_FLEET_SPEED_RESEARCH }
+      { level: 3, research: PIRATE_FLEET_ATTACK_RESEARCH },
+      { level: 1, research: PIRATE_FLEET_SHIELD_RESEARCH },
+      { level: 3, research: PIRATE_FLEET_HULL_RESEARCH },
+      { level: 3, research: PIRATE_FLEET_ENERGY_RESEARCH },
+      { level: 4, research: PIRATE_FLEET_BUILDING_RESEARCH },
+      { level: 3, research: PIRATE_FLEET_SPEED_RESEARCH }
     ]
   },
 
@@ -882,8 +880,8 @@ const pirateTroops: IUnit[] = [
 
 const pirateSpaceships: IUnit[] = [
   pirateReconDrone,
+  pirateScrapFighter,
   pirateStarFighter,
-  pirateInterceptor,
   pirateCruiser,
   pirateBrigantine,
   pirateImperialCorsairFrigate,
diff --git a/packages/game-engine/src/engine/fleets/getAmountOfStarFighters.ts b/packages/game-engine/src/engine/fleets/getAmountOfStarFighters.ts
new file mode 100644
index 0000000..bd8857e
--- /dev/null
+++ b/packages/game-engine/src/engine/fleets/getAmountOfStarFighters.ts
@@ -0,0 +1,15 @@
+import { IFleetUnits } from '../../types/IFleet'
+
+function getAmountOfStarFighters(units: IFleetUnits[]): number {
+  return units.reduce((starFighters, { unit, amount }) => {
+    const isStarFighter = unit.subtype === 'STAR_FIGHTER'
+
+    if (isStarFighter) {
+      return amount + starFighters
+    }
+
+    return starFighters
+  }, 0)
+}
+
+export default getAmountOfStarFighters
diff --git a/packages/game-engine/src/engine/fleets/getAmountOfTroops.ts b/packages/game-engine/src/engine/fleets/getAmountOfTroops.ts
new file mode 100644
index 0000000..343f4df
--- /dev/null
+++ b/packages/game-engine/src/engine/fleets/getAmountOfTroops.ts
@@ -0,0 +1,13 @@
+import { IFleetUnits } from '../../types/IFleet'
+
+function getAmountOfTroops(units: IFleetUnits[]): number {
+  return units.reduce((troops, { unit, amount }) => {
+    if (unit.type === 'TROOP') {
+      return amount + troops
+    }
+
+    return troops
+  }, 0)
+}
+
+export default getAmountOfTroops
diff --git a/packages/game-engine/src/engine/fleets/getBaseFleetSpeed.ts b/packages/game-engine/src/engine/fleets/getBaseFleetSpeed.ts
new file mode 100644
index 0000000..c498576
--- /dev/null
+++ b/packages/game-engine/src/engine/fleets/getBaseFleetSpeed.ts
@@ -0,0 +1,26 @@
+import { IFleetUnits } from '../../types/IFleet'
+import getAmountOfStarFighters from './getAmountOfStarFighters'
+import getFleetStarFighterCapacity from './getFleetStarFighterCapacity'
+
+function getBaseFleetSpeed(units: IFleetUnits[]): number {
+  const starFighterCapacity = getFleetStarFighterCapacity(units)
+  const amountOfStarFighters = getAmountOfStarFighters(units)
+
+  const spaceshipUnits = units.filter(({ unit }) => unit.type === 'SPACESHIP')
+
+  if (starFighterCapacity > amountOfStarFighters) {
+    const spaceshipUnitsWithoutStarFighters = spaceshipUnits.filter(
+      ({ unit }) => unit.subtype !== 'STAR_FIGHTER'
+    )
+
+    return spaceshipUnitsWithoutStarFighters.reduce((fleetSpeed, { unit }) => {
+      return fleetSpeed < unit.stats.speed ? fleetSpeed : unit.stats.speed
+    }, spaceshipUnitsWithoutStarFighters[0].unit.stats.speed)
+  }
+
+  return spaceshipUnits.reduce((fleetSpeed, { unit }) => {
+    return fleetSpeed < unit.stats.speed ? fleetSpeed : unit.stats.speed
+  }, spaceshipUnits[0].unit.stats.speed)
+}
+
+export default getBaseFleetSpeed
diff --git a/packages/game-engine/src/engine/fleets/getFleetDistance.ts b/packages/game-engine/src/engine/fleets/getFleetDistance.ts
new file mode 100644
index 0000000..dbfc257
--- /dev/null
+++ b/packages/game-engine/src/engine/fleets/getFleetDistance.ts
@@ -0,0 +1,18 @@
+import { IPlanet } from '../../types/IPlanet'
+
+function getFleetDistance(from: IPlanet, to: IPlanet): number {
+  const planetDistance = Math.abs(from.coordinates.planet - to.coordinates.planet)
+  const systemDistance = Math.abs(from.coordinates.system - to.coordinates.system)
+  const sectorDistance = Math.abs(from.coordinates.sector - to.coordinates.sector)
+  const galaxyDistance = Math.abs(from.coordinates.galaxy - to.coordinates.galaxy)
+
+  return (
+    50_000 +
+    planetDistance * 20_000 +
+    systemDistance * 90_000 +
+    sectorDistance * 200_000 +
+    galaxyDistance * 2_500_000
+  )
+}
+
+export default getFleetDistance
diff --git a/packages/game-engine/src/engine/fleets/getFleetDuration.ts b/packages/game-engine/src/engine/fleets/getFleetDuration.ts
new file mode 100644
index 0000000..ea959c0
--- /dev/null
+++ b/packages/game-engine/src/engine/fleets/getFleetDuration.ts
@@ -0,0 +1,21 @@
+import { IFleetUnits } from '../../types/IFleet'
+import { IPlanet } from '../../types/IPlanet'
+import { IPlayer } from '../../types/IPlayer'
+import getFleetDistance from './getFleetDistance'
+import getFleetSpeed from './getFleetSpeed'
+
+function getFleetDuration(
+  from: IPlanet,
+  to: IPlanet,
+  units: IFleetUnits[],
+  player: IPlayer
+): number {
+  const distance = getFleetDistance(from, to)
+  const fleetSpeed = getFleetSpeed(units, player)
+
+  const duration = Math.trunc(distance / fleetSpeed)
+
+  return duration * 1_000
+}
+
+export default getFleetDuration
diff --git a/packages/game-engine/src/engine/fleets/getFleetResourceCapacity.ts b/packages/game-engine/src/engine/fleets/getFleetResourceCapacity.ts
new file mode 100644
index 0000000..38bfb50
--- /dev/null
+++ b/packages/game-engine/src/engine/fleets/getFleetResourceCapacity.ts
@@ -0,0 +1,9 @@
+import { IFleetUnits } from '../../types/IFleet'
+
+function getFleetResourceCapacity(units: IFleetUnits[]): number {
+  return units.reduce((resourceCapacity, { unit, amount }) => {
+    return unit.stats.cargo * amount + resourceCapacity
+  }, 0)
+}
+
+export default getFleetResourceCapacity
diff --git a/packages/game-engine/src/engine/fleets/getFleetSpeed.ts b/packages/game-engine/src/engine/fleets/getFleetSpeed.ts
new file mode 100644
index 0000000..189b496
--- /dev/null
+++ b/packages/game-engine/src/engine/fleets/getFleetSpeed.ts
@@ -0,0 +1,16 @@
+import { IFleetUnits } from '../../types/IFleet'
+import { IPlayer } from '../../types/IPlayer'
+import computedBonus from '../bonus/computedBonus'
+import getBaseFleetSpeed from './getBaseFleetSpeed'
+
+// TODO: create an util
+function getFleetSpeed(units: IFleetUnits[], player: IPlayer): number {
+  const baseFleetSpeed = getBaseFleetSpeed(units)
+  const fleetSpeedBonus = computedBonus(player.perks, 'FLEET_SPEED_BONUS')
+
+  const fleetSpeed = baseFleetSpeed * (fleetSpeedBonus / 100)
+
+  return fleetSpeed
+}
+
+export default getFleetSpeed
diff --git a/packages/game-engine/src/engine/fleets/getFleetStarFighterCapacity.ts b/packages/game-engine/src/engine/fleets/getFleetStarFighterCapacity.ts
new file mode 100644
index 0000000..544c058
--- /dev/null
+++ b/packages/game-engine/src/engine/fleets/getFleetStarFighterCapacity.ts
@@ -0,0 +1,9 @@
+import { IFleetUnits } from '../../types/IFleet'
+
+function getFleetStarFighterCapacity(units: IFleetUnits[]): number {
+  return units.reduce((starFighterCapacity, { unit, amount }) => {
+    return unit.stats.starFighterCapacity * amount + starFighterCapacity
+  }, 0)
+}
+
+export default getFleetStarFighterCapacity
diff --git a/packages/game-engine/src/engine/fleets/getFleetTroopsCapacity.ts b/packages/game-engine/src/engine/fleets/getFleetTroopsCapacity.ts
new file mode 100644
index 0000000..bb29f9a
--- /dev/null
+++ b/packages/game-engine/src/engine/fleets/getFleetTroopsCapacity.ts
@@ -0,0 +1,9 @@
+import { IFleetUnits } from '../../types/IFleet'
+
+function getFleetTroopsCapacity(units: IFleetUnits[]): number {
+  return units.reduce((troopsCapacity, { unit, amount }) => {
+    return unit.stats.troopsCapacity * amount + troopsCapacity
+  }, 0)
+}
+
+export default getFleetTroopsCapacity
diff --git a/packages/game-engine/src/engine/processTasks.ts b/packages/game-engine/src/engine/processTasks.ts
index 0839068..360a6b0 100644
--- a/packages/game-engine/src/engine/processTasks.ts
+++ b/packages/game-engine/src/engine/processTasks.ts
@@ -13,7 +13,11 @@ import {
   FINISH_BUILD_UNITS_TASK_TYPE,
   START_BUILD_UNITS_TASK_TYPE,
   FinishBuildUnitsTaskData,
-  StartBuildUnitsTaskData
+  StartBuildUnitsTaskData,
+  FINISH_FLEET_TASK_TYPE,
+  START_FLEET_TASK_TYPE,
+  StartFleetTaskData,
+  FinishFleetTaskData
 } from '../types/ITask'
 import taskRepository from '../repositories/taskRepository'
 import playerRepository from '../repositories/playerRepository'
@@ -30,6 +34,7 @@ import GameEngineError from './errors/GameEngineError'
 async function processTasks(tasks: ITaskDocument[], universe: IUniverseDocument) {
   const tasksGroupedBySeconds = groupTasksBySeconds(tasks, universe)
 
+  // TODO: include tasksGroupedBySeconds to push directly the new tasks
   for (const { tasks, second } of tasksGroupedBySeconds) {
     // 0.- Calculate player resources
     await processResourceProduction(tasks, second)
@@ -74,6 +79,27 @@ async function processTasks(tasks: ITaskDocument[], universe: IUniverseDocument)
     )
     await processTasksSequentially(startBuildUnitsTasks, startBuildUnitsTaskHandler, second)
 
+    // 6.- Finish Fleets Tasks
+    const finishFleetTaskHandler = TASK_HANDLER[FINISH_FLEET_TASK_TYPE].handler
+
+    const finishFleetTasks = await taskRepository.getPendingTasksByType(
+      universe._id,
+      second,
+      FINISH_FLEET_TASK_TYPE
+    )
+
+    await processTasksSequentially(finishFleetTasks, finishFleetTaskHandler, second)
+
+    // 7.- Start Fleets Tasks
+    const startFleetTaskHandler = TASK_HANDLER[START_FLEET_TASK_TYPE].handler
+
+    const startFleetTasks = await taskRepository.getPendingTasksByType(
+      universe._id,
+      second,
+      START_FLEET_TASK_TYPE
+    )
+    await processTasksSequentially(startFleetTasks, startFleetTaskHandler, second)
+
     // update universe
     universe.lastProcessedTime = second
     await universe.save()
@@ -148,6 +174,7 @@ async function processResourceProduction(
   }[] = []
 
   // TODO: implement targetPlanet feature
+  // for FLEETS from planet and to planet
   for (const task of tasks) {
     // calculate all player planet production
     if (isPlayerTaskData(task.data)) {
@@ -196,6 +223,8 @@ function isPlayerTaskData(
   | StartResearchTaskData
   | FinishResearchTaskData
   | StartBuildUnitsTaskData
-  | FinishBuildUnitsTaskData {
+  | FinishBuildUnitsTaskData
+  | StartFleetTaskData
+  | FinishFleetTaskData {
   return 'playerId' in taskData
 }
diff --git a/packages/game-engine/src/engine/tasks/processCreateNewPlayerTask.ts b/packages/game-engine/src/engine/tasks/processCreateNewPlayerTask.ts
index 4e3bffc..508757b 100644
--- a/packages/game-engine/src/engine/tasks/processCreateNewPlayerTask.ts
+++ b/packages/game-engine/src/engine/tasks/processCreateNewPlayerTask.ts
@@ -69,14 +69,13 @@ async function processCreateNewPlayerTask(
     researches: {
       researched: [],
       queue: []
-    },
-
-    fleets: []
+    }
   }
 
   const newPlayer = new PlayerModel(newPlayerData)
 
   principalPlanet.ownerId = newPlayer._id.toString()
+  principalPlanet.exploredBy = [newPlayer._id.toString()]
   principalPlanet.isPrincipal = true
   principalPlanet.isExplored = true
   principalPlanet.colonizedAt = second
diff --git a/packages/game-engine/src/engine/tasks/processFinishBuildUnitsTask.ts b/packages/game-engine/src/engine/tasks/processFinishBuildUnitsTask.ts
index 6634006..c6008f1 100644
--- a/packages/game-engine/src/engine/tasks/processFinishBuildUnitsTask.ts
+++ b/packages/game-engine/src/engine/tasks/processFinishBuildUnitsTask.ts
@@ -5,15 +5,16 @@ import PointModel from '../../models/PointModel'
 import { ITaskTypeDocument } from '../../models/TaskModel'
 import playerRepository from '../../repositories/playerRepository'
 import upgradeBonus from '../bonus/upgradeBonus'
-import FleetModel from '../../models/FleetModel'
 import hasBonus from '../../helpers/hasBonus'
 import getTotalAmountOfUnits from '../units/getTotalAmountOfUnits'
 import { UnitTypes } from '../../types/IUnit'
 import { IPlanet } from '../../types/IPlanet'
 import createStartBuildUnitsTask from './utils/createStartBuildUnitsTask'
 import taskRepository from '../../repositories/taskRepository'
+import playerUnitsRepository from '../../repositories/playerUnitsRepository'
 import getPlayerUnit from '../units/getPlayerUnit'
 import getFirstUnitInTheBuildQueue from '../units/getFirstUnitInTheBuildQueue'
+import PlayerUnitsModel from '../../models/PlayerUnitsModel'
 
 async function processFinishBuildUnitsTask(
   task: ITaskTypeDocument<FinishBuildUnitsTaskType>,
@@ -40,35 +41,26 @@ async function processFinishBuildUnitsTask(
     throw new GameEngineError('invalid unit')
   }
 
-  // planet fleet (no travel defined)
-  const existingPlanetFleet = player.fleets.find(
-    (fleet) => fleet.planet._id.equals(planet._id) && !fleet.travel
+  const playerUnitsInThePlanet = await playerUnitsRepository.findPlayerUnitsInThePlanet(
+    player._id.toString(),
+    planet._id.toString()
   )
 
-  const planetFleet =
-    existingPlanetFleet ||
-    new FleetModel({
+  const unitsInThePlanet =
+    playerUnitsInThePlanet ||
+    new PlayerUnitsModel({
       planet,
-      playerId: player._id,
-      units: [
-        {
-          unit,
-          amount: task.data.build.amount
-        }
-      ]
+      player,
+      units: []
     })
 
-  // update player fleets with the new fleet
-  if (!existingPlanetFleet) {
-    player.fleets.push(planetFleet)
-  }
-
-  const fleetUnit = planetFleet.units.find((fleetUnit) => fleetUnit.unit._id.equals(unit._id))
+  const planetUnit = unitsInThePlanet.units.find(({ unit }) => unit._id.equals(unit._id))
 
-  if (fleetUnit) {
-    fleetUnit.amount += task.data.build.amount
+  // add unit or update amount
+  if (planetUnit) {
+    planetUnit.amount += task.data.build.amount
   } else {
-    planetFleet.units.push({
+    unitsInThePlanet.units.push({
       unit,
       amount: task.data.build.amount
     })
@@ -78,14 +70,15 @@ async function processFinishBuildUnitsTask(
   const hasBonusToUpdate = hasBonus(unit.bonus)
 
   if (hasBonusToUpdate) {
+    const playerUnits = await playerUnitsRepository.findPlayerUnits(player._id.toString())
     const PlayerBonus = player.perks.find((perk) => perk.sourceId === unit._id.toString())
 
     if (PlayerBonus) {
-      const totalAmountOfUnits = getTotalAmountOfUnits(player, unit)
-      PlayerBonus.bonus = upgradeBonus(unit.bonus, totalAmountOfUnits)
+      const totalAmountOfUnits = getTotalAmountOfUnits(playerUnits, unit)
+      PlayerBonus.bonus = upgradeBonus(unit.bonus, totalAmountOfUnits + task.data.build.amount)
     } else {
       player.perks.push({
-        bonus: unit.bonus,
+        bonus: upgradeBonus(unit.bonus, task.data.build.amount),
         sourceId: unit._id.toString(),
         sourceName: unit.name,
         type: 'Unit'
@@ -127,14 +120,14 @@ async function processFinishBuildUnitsTask(
 
     return Promise.all([
       player.save(),
-      planetFleet.save(),
+      unitsInThePlanet.save(),
       points.save(),
       planet.save(),
       taskRepository.createStartBuildUnitsTask(buildUnitsTask)
     ])
   }
 
-  return Promise.all([player.save(), planetFleet.save(), points.save(), planet.save()])
+  return Promise.all([player.save(), unitsInThePlanet.save(), points.save(), planet.save()])
 }
 
 export default processFinishBuildUnitsTask
diff --git a/packages/game-engine/src/engine/tasks/processFinishFleetTask.ts b/packages/game-engine/src/engine/tasks/processFinishFleetTask.ts
new file mode 100644
index 0000000..3ce8752
--- /dev/null
+++ b/packages/game-engine/src/engine/tasks/processFinishFleetTask.ts
@@ -0,0 +1,218 @@
+import FleetModel, { IFleetDocument } from '../../models/FleetModel'
+import { IPlanetDocument } from '../../models/PlanetModel'
+import { IPlayerDocument } from '../../models/PlayerModel'
+import PlayerUnitsModel from '../../models/PlayerUnitsModel'
+import getTaskModel, { ITaskTypeDocument } from '../../models/TaskModel'
+import fleetRepository from '../../repositories/fleetRepository'
+import planetRepository from '../../repositories/planetRepository'
+import playerRepository from '../../repositories/playerRepository'
+import playerUnitsRepository from '../../repositories/playerUnitsRepository'
+import unitRepository from '../../repositories/unitRepository'
+import {
+  FINISH_FLEET_TASK_TYPE,
+  FinishFleetTaskType,
+  ITask,
+  PENDING_TASK_STATUS
+} from '../../types/ITask'
+import GameEngineError from '../errors/GameEngineError'
+
+async function processFinishFleetTask(
+  task: ITaskTypeDocument<FinishFleetTaskType>,
+  second: number
+) {
+  // TODO: USE PROMISE ALL ???
+  // get all the required data from DB
+  const player = await playerRepository.findPlayerById(task.data.playerId)
+  const fromPlanet = await planetRepository.findPlanetById(task.data.fromPlanetId)
+  const toPlanet = await planetRepository.findPlanetById(task.data.toPlanetId)
+  const fleet = await fleetRepository.findFleetById(task.data.fleetId)
+
+  if (!player) {
+    throw new GameEngineError('invalid player')
+  }
+
+  if (!fromPlanet) {
+    throw new GameEngineError('invalid from planet')
+  }
+
+  if (!toPlanet) {
+    throw new GameEngineError('invalid to planet')
+  }
+
+  if (toPlanet._id.equals(fromPlanet._id)) {
+    throw new GameEngineError('invalid planet')
+  }
+
+  if (!fleet) {
+    throw new GameEngineError('invalid fleet')
+  }
+
+  if (task.data.isReturning) {
+    return processReturningFleetTask({
+      fleet,
+      player,
+      toPlanet,
+      taskData: task.data
+    })
+  }
+
+  if (task.data.fleetType === 'EXPLORE_FLEET_TYPE') {
+    return processFinishExploreFleetTask({
+      fleet,
+      player,
+      fromPlanet,
+      toPlanet,
+      taskData: task.data,
+      second
+    })
+  }
+
+  throw 'fleet type not implemented'
+}
+
+export default processFinishFleetTask
+
+type ReturningFleetType = {
+  fleet: IFleetDocument
+  player: IPlayerDocument
+  toPlanet: IPlanetDocument
+  taskData: ITask<'FINISH_FLEET_UNITS_TASK'>['data']
+}
+
+async function processReturningFleetTask({
+  fleet,
+  player,
+  toPlanet,
+  taskData
+}: ReturningFleetType) {
+  const playerUnitsInThePlanet = await playerUnitsRepository.findPlayerUnitsInThePlanet(
+    player._id.toString(),
+    toPlanet._id.toString()
+  )
+
+  const unitsInThePlanet =
+    playerUnitsInThePlanet ||
+    new PlayerUnitsModel({
+      planet: toPlanet,
+      player,
+      units: []
+    })
+
+  const units = await unitRepository.findUnits()
+
+  // restore units in the fleet planet
+  for (let i = 0; i < taskData.units.length; i++) {
+    const fleetUnit = taskData.units[i]
+
+    const planetUnit = unitsInThePlanet.units.find(({ unit }) => unit.name === fleetUnit.unit.name)
+
+    if (planetUnit) {
+      planetUnit.amount += fleetUnit.amount
+    } else {
+      const unit = units.find((unit) => unit.name === fleetUnit.unit.name)
+
+      if (!unit) {
+        throw new GameEngineError('invalid fleet unit')
+      }
+
+      unitsInThePlanet.units.push({
+        unit,
+        amount: fleetUnit.amount
+      })
+    }
+  }
+
+  // planet resources
+  toPlanet.resources += fleet.resources
+
+  fleet.isFinished = true
+
+  return Promise.all([fleet.save(), unitsInThePlanet.save()])
+}
+
+type FinishExploreFleetType = {
+  fleet: IFleetDocument
+  player: IPlayerDocument
+  fromPlanet: IPlanetDocument
+  toPlanet: IPlanetDocument
+  taskData: ITask<'FINISH_FLEET_UNITS_TASK'>['data']
+  second: number
+}
+
+async function processFinishExploreFleetTask({
+  fleet,
+  player,
+  fromPlanet,
+  toPlanet,
+  taskData,
+  second
+}: FinishExploreFleetType) {
+  const executeTaskAt = second + fleet.duration
+
+  // finish actual fleet
+  fleet.isFinished = true
+
+  // create returning fleet
+  const newReturningFleet = new FleetModel({
+    playerId: player._id.toString(),
+    units: taskData.units,
+    isReturning: true,
+    isFinished: false,
+    fromPlanet: toPlanet,
+    toPlanet: fromPlanet,
+    startedAt: second,
+    arriveAt: executeTaskAt,
+    duration: fleet.duration,
+    fleetType: taskData.fleetType,
+    resources: 0
+  })
+
+  toPlanet.isExplored = true
+
+  // TODO: implement createBaseTask helper function
+  const finishBuildUnitsTask: ITask<FinishFleetTaskType> = {
+    type: FINISH_FLEET_TASK_TYPE,
+    universeId: player.universeId,
+    data: {
+      playerId: player._id.toString(),
+      fromPlanetId: toPlanet._id.toString(),
+      toPlanetId: fromPlanet._id.toString(),
+      units: taskData.units,
+      resources: taskData.resources,
+      fleetType: taskData.fleetType,
+      allUnitsInThePlanet: taskData.allUnitsInThePlanet,
+      allResourcesInThePlanet: taskData.allResourcesInThePlanet,
+      isReturning: true,
+      arriveAt: executeTaskAt,
+      fleetId: newReturningFleet._id.toString()
+    },
+    status: PENDING_TASK_STATUS,
+    isCancellable: true,
+    executeTaskAt,
+    processedAt: null,
+    processingDuration: null,
+    history: [
+      {
+        taskStatus: PENDING_TASK_STATUS,
+        updatedAt: new Date().getTime()
+      }
+    ],
+    errorDetails: null
+  }
+  const taskModel = getTaskModel<FinishFleetTaskType>()
+  const newTask = new taskModel(finishBuildUnitsTask)
+
+  newReturningFleet.taskId = newTask._id.toString()
+
+  // TODO: create exploration report
+
+  const isAlreadyExplored = toPlanet.exploredBy.some(
+    (exploredPlayer) => exploredPlayer === player._id.toString()
+  )
+
+  if (!isAlreadyExplored) {
+    toPlanet.exploredBy.push(player._id.toString())
+  }
+
+  return Promise.all([newTask.save(), toPlanet.save(), fleet.save(), newReturningFleet.save()])
+}
diff --git a/packages/game-engine/src/engine/tasks/processStartBuildUnitsTask.ts b/packages/game-engine/src/engine/tasks/processStartBuildUnitsTask.ts
index a9c9b0f..7f85927 100644
--- a/packages/game-engine/src/engine/tasks/processStartBuildUnitsTask.ts
+++ b/packages/game-engine/src/engine/tasks/processStartBuildUnitsTask.ts
@@ -19,12 +19,15 @@ import { IPlanet } from '../../types/IPlanet'
 import getPlayerUnit from '../units/getPlayerUnit'
 import getFirstUnitInTheBuildQueue from '../units/getFirstUnitInTheBuildQueue'
 import taskRepository from '../../repositories/taskRepository'
+import playerUnitsRepository from '../../repositories/playerUnitsRepository'
 import createStartBuildUnitsTask from './utils/createStartBuildUnitsTask'
+import fleetRepository from '../../repositories/fleetRepository'
 
 async function processStartBuildUnitsTask(
   task: ITaskTypeDocument<StartBuildUnitsTaskType>,
   second: number
 ) {
+  // TODO: promise all 3 request
   // get all the required data from DB
   const player = await playerRepository.findPlayerById(task.data.playerId)
 
@@ -58,6 +61,9 @@ async function processStartBuildUnitsTask(
     throw new GameEngineError('player already building defenses in this planet')
   }
 
+  const playerUnits = await playerUnitsRepository.findPlayerUnits(player._id.toString())
+  const playerFleets = await fleetRepository.findFleetsByPlayerId(player._id.toString())
+
   const buildUnitsType: Record<UnitTypes, keyof IPlanet['unitBuild']> = {
     TROOP: 'troops',
     SPACESHIP: 'spaceships',
@@ -65,8 +71,14 @@ async function processStartBuildUnitsTask(
   }
 
   const { isUnitAvailable, requirements } = checkUnitRequirements(unit, player)
-  const isValidAmount = isValidUnitAmount(unit, task.data.build.amount, player)
-  const isHeroUnitAlreadyBuild = isHeroAlreadyBuild(unit, player.fleets)
+  const isValidAmount = isValidUnitAmount(
+    unit,
+    task.data.build.amount,
+    player,
+    playerUnits,
+    playerFleets
+  )
+  const isHeroUnitAlreadyBuild = isHeroAlreadyBuild(unit, playerUnits)
 
   const resourceCost = unit.resourceCost * task.data.build.amount
   const unitEnergyCost = unit.energyCost || 0
diff --git a/packages/game-engine/src/engine/tasks/processStartFleetTask.ts b/packages/game-engine/src/engine/tasks/processStartFleetTask.ts
new file mode 100644
index 0000000..d6a658d
--- /dev/null
+++ b/packages/game-engine/src/engine/tasks/processStartFleetTask.ts
@@ -0,0 +1,196 @@
+import FleetModel from '../../models/FleetModel'
+import { IPlanetDocument } from '../../models/PlanetModel'
+import { IPlayerDocument } from '../../models/PlayerModel'
+import { IPlayerUnitsDocument } from '../../models/PlayerUnitsModel'
+import getTaskModel, { ITaskTypeDocument } from '../../models/TaskModel'
+import fleetRepository from '../../repositories/fleetRepository'
+import planetRepository from '../../repositories/planetRepository'
+import playerRepository from '../../repositories/playerRepository'
+import playerUnitsRepository from '../../repositories/playerUnitsRepository'
+import {
+  FINISH_FLEET_TASK_TYPE,
+  FinishFleetTaskType,
+  ITask,
+  PENDING_TASK_STATUS,
+  StartFleetTaskType
+} from '../../types/ITask'
+import computedBonus from '../bonus/computedBonus'
+import GameEngineError from '../errors/GameEngineError'
+import getAmountOfTroops from '../fleets/getAmountOfTroops'
+import getFleetDuration from '../fleets/getFleetDuration'
+import getFleetResourceCapacity from '../fleets/getFleetResourceCapacity'
+import getFleetTroopsCapacity from '../fleets/getFleetTroopsCapacity'
+
+async function processStartFleetTask(task: ITaskTypeDocument<StartFleetTaskType>, second: number) {
+  // get all the required data from DB
+  const player = await playerRepository.findPlayerById(task.data.playerId)
+  const fromPlanet = await planetRepository.findPlanetById(task.data.fromPlanetId)
+  const toPlanet = await planetRepository.findPlanetById(task.data.toPlanetId)
+
+  if (!player) {
+    throw new GameEngineError('invalid player')
+  }
+
+  if (!fromPlanet) {
+    throw new GameEngineError('invalid from planet')
+  }
+
+  if (!toPlanet) {
+    throw new GameEngineError('invalid to planet')
+  }
+
+  if (toPlanet._id.equals(fromPlanet._id)) {
+    throw new GameEngineError('invalid planet')
+  }
+
+  const activePlayerFleets = await fleetRepository.findFleetsByPlayerId(player._id.toString())
+
+  const maxPlayerFleets = computedBonus(player.perks, 'MAX_FLEETS_ALLOWED_BONUS')
+
+  if (activePlayerFleets && activePlayerFleets.length > maxPlayerFleets) {
+    throw new GameEngineError('invalid amount of active fleets')
+  }
+
+  const playerUnitsInThePlanet = await playerUnitsRepository.findPlayerUnitsInThePlanet(
+    player._id.toString(),
+    fromPlanet._id.toString()
+  )
+
+  if (!playerUnitsInThePlanet) {
+    throw new GameEngineError('invalid units in the planet')
+  }
+
+  // units present in the planet and no defenses present
+  const isInvalidFleetUnits = task.data.units.some(({ unit, amount }) => {
+    const planetUnit = playerUnitsInThePlanet.units.find(
+      (planetUnit) => planetUnit.unit.name === unit.name
+    )
+
+    return !planetUnit || amount > planetUnit.amount || unit.type === 'DEFENSE'
+  })
+
+  if (isInvalidFleetUnits) {
+    throw new GameEngineError('invalid units in the planet')
+  }
+
+  // check troops capacity
+  const troopsCapacity = getFleetTroopsCapacity(task.data.units)
+  const amountOfTroops = getAmountOfTroops(task.data.units)
+
+  if (amountOfTroops > troopsCapacity) {
+    throw new GameEngineError('invalid amount of troops in the fleet')
+  }
+
+  // check resources
+  if (task.data.resources > fromPlanet.resources) {
+    throw new GameEngineError('invalid resources')
+  }
+
+  const fleetResourceCapacity = getFleetResourceCapacity(task.data.units)
+
+  if (task.data.resources > fleetResourceCapacity) {
+    throw new GameEngineError('invalid fleet resources capacity')
+  }
+
+  if (task.data.fleetType === 'EXPLORE_FLEET_TYPE') {
+    return processStartExploreFleetTask({
+      player,
+      fromPlanet,
+      toPlanet,
+      taskData: task.data,
+      second,
+      playerUnitsInThePlanet
+    })
+  }
+
+  throw 'fleet type not implemented'
+}
+
+export default processStartFleetTask
+
+type StartExploreFleetType = {
+  player: IPlayerDocument
+  fromPlanet: IPlanetDocument
+  toPlanet: IPlanetDocument
+  taskData: ITask<'START_FLEET_UNITS_TASK'>['data']
+  second: number
+  playerUnitsInThePlanet: IPlayerUnitsDocument
+}
+
+async function processStartExploreFleetTask({
+  player,
+  fromPlanet,
+  toPlanet,
+  taskData,
+  second,
+  playerUnitsInThePlanet
+}: StartExploreFleetType) {
+  const fleetDuration = getFleetDuration(fromPlanet, toPlanet, taskData.units, player)
+  const executeTaskAt = second + fleetDuration
+
+  // update planet units
+  taskData.units.forEach((fleetUnit) => {
+    const planetUnit = playerUnitsInThePlanet.units.find(
+      ({ unit }) => unit.name === fleetUnit.unit.name
+    )
+
+    planetUnit!.amount -= fleetUnit.amount
+  })
+
+  const newPlayerFleet = new FleetModel({
+    playerId: player._id.toString(),
+    units: taskData.units,
+    isReturning: false,
+    isFinished: false,
+    fromPlanet,
+    toPlanet,
+    startedAt: second,
+    arriveAt: executeTaskAt,
+    duration: fleetDuration,
+    fleetType: taskData.fleetType,
+    resources: 0
+  })
+
+  // TODO: implement createBaseTask helper function
+  const finishFleetTask: ITask<FinishFleetTaskType> = {
+    type: FINISH_FLEET_TASK_TYPE,
+    universeId: player.universeId,
+    data: {
+      playerId: player._id.toString(),
+      fromPlanetId: fromPlanet._id.toString(),
+      toPlanetId: toPlanet._id.toString(),
+      units: taskData.units,
+      resources: 0,
+      fleetType: taskData.fleetType,
+      allUnitsInThePlanet: false,
+      allResourcesInThePlanet: false,
+      isReturning: false,
+      arriveAt: executeTaskAt,
+      fleetId: newPlayerFleet._id.toString()
+    },
+    status: PENDING_TASK_STATUS,
+    isCancellable: true,
+    executeTaskAt,
+    processedAt: null,
+    processingDuration: null,
+    history: [
+      {
+        taskStatus: PENDING_TASK_STATUS,
+        updatedAt: new Date().getTime()
+      }
+    ],
+    errorDetails: null
+  }
+  const taskModel = getTaskModel<FinishFleetTaskType>()
+  const newTask = new taskModel(finishFleetTask)
+
+  newPlayerFleet.taskId = newTask._id.toString()
+
+  return Promise.all([
+    newTask.save(),
+    player.save(),
+    playerUnitsInThePlanet.save(),
+    newPlayerFleet.save(),
+    fromPlanet.save()
+  ])
+}
diff --git a/packages/game-engine/src/engine/tasks/taskHandlers.ts b/packages/game-engine/src/engine/tasks/taskHandlers.ts
index 30f7d1e..bdddb4b 100644
--- a/packages/game-engine/src/engine/tasks/taskHandlers.ts
+++ b/packages/game-engine/src/engine/tasks/taskHandlers.ts
@@ -10,10 +10,14 @@ import {
   START_RESEARCH_TASK_TYPE,
   FINISH_RESEARCH_TASK_TYPE,
   START_BUILD_UNITS_TASK_TYPE,
-  FINISH_BUILD_UNITS_TASK_TYPE
+  FINISH_BUILD_UNITS_TASK_TYPE,
+  START_FLEET_TASK_TYPE,
+  FINISH_FLEET_TASK_TYPE
 } from '../../types/ITask'
 import processStartBuildUnitsTask from './processStartBuildUnitsTask'
 import processFinishBuildUnitsTask from './processFinishBuildUnitsTask'
+import processStartFleetTask from './processStartFleetTask'
+import processFinishFleetTask from './processFinishFleetTask'
 
 type taskPriority = {
   [Type in TaskType]: number
@@ -29,9 +33,9 @@ const TASK_PRIORITY: taskPriority = {
   [FINISH_RESEARCH_TASK_TYPE]: 2,
   [START_RESEARCH_TASK_TYPE]: 3,
   [FINISH_BUILD_UNITS_TASK_TYPE]: 4,
-  [START_BUILD_UNITS_TASK_TYPE]: 5
-  // [FINISH_FLEET_TASK_TYPE]: 8, // <== Process all battles here!!
-  // [START_FLEET_TASK_TYPE]: 9
+  [START_BUILD_UNITS_TASK_TYPE]: 5,
+  [FINISH_FLEET_TASK_TYPE]: 6, // <== TODO: Process all battles here!!
+  [START_FLEET_TASK_TYPE]: 7
 }
 
 // fleet types priority (finish)
@@ -92,18 +96,28 @@ export const TASK_HANDLER: TaskHandlerType = {
     priority: TASK_PRIORITY[FINISH_RESEARCH_TASK_TYPE]
   },
   [START_RESEARCH_TASK_TYPE]: {
-    processTasksInParallel: true,
+    processTasksInParallel: false,
     handler: processStartResearchTask,
     priority: TASK_PRIORITY[START_RESEARCH_TASK_TYPE]
   },
   [START_BUILD_UNITS_TASK_TYPE]: {
-    processTasksInParallel: true,
+    processTasksInParallel: false,
     handler: processStartBuildUnitsTask,
     priority: TASK_PRIORITY[START_BUILD_UNITS_TASK_TYPE]
   },
   [FINISH_BUILD_UNITS_TASK_TYPE]: {
     processTasksInParallel: true,
     handler: processFinishBuildUnitsTask,
-    priority: TASK_PRIORITY[START_BUILD_UNITS_TASK_TYPE]
+    priority: TASK_PRIORITY[FINISH_BUILD_UNITS_TASK_TYPE]
+  },
+  [FINISH_FLEET_TASK_TYPE]: {
+    processTasksInParallel: true,
+    handler: processFinishFleetTask,
+    priority: TASK_PRIORITY[FINISH_FLEET_TASK_TYPE]
+  },
+  [START_FLEET_TASK_TYPE]: {
+    processTasksInParallel: false,
+    handler: processStartFleetTask,
+    priority: TASK_PRIORITY[START_FLEET_TASK_TYPE]
   }
 }
diff --git a/packages/game-engine/src/engine/tasks/utils/createStartFleetTask.ts b/packages/game-engine/src/engine/tasks/utils/createStartFleetTask.ts
new file mode 100644
index 0000000..7158076
--- /dev/null
+++ b/packages/game-engine/src/engine/tasks/utils/createStartFleetTask.ts
@@ -0,0 +1,75 @@
+import { FleetTypes, IFleetUnits } from 'packages/game-engine/src/types/IFleet'
+
+import {
+  ITask,
+  PENDING_TASK_STATUS,
+  START_FLEET_TASK_TYPE,
+  StartFleetTaskType
+} from '../../../types/ITask'
+import getSecond from '../../../helpers/getSecond'
+
+type FleetDataType = {
+  playerId: string
+  fromPlanetId: string
+  toPlanetId: string
+  units: IFleetUnits[]
+  resources: number
+  fleetType: FleetTypes
+  allUnitsInThePlanet?: boolean
+  allResourcesInThePlanet?: boolean
+}
+
+// TODO: add create BASE task
+function createStartFleetTask(
+  universeId: string,
+  fleetData: FleetDataType,
+  executeTaskAt?: number
+): ITask<StartFleetTaskType> {
+  const {
+    playerId,
+    fromPlanetId,
+    toPlanetId,
+    units,
+    resources,
+    fleetType,
+    allUnitsInThePlanet,
+    allResourcesInThePlanet
+  } = fleetData
+
+  const startResearchTask: ITask<StartFleetTaskType> = {
+    type: START_FLEET_TASK_TYPE,
+
+    universeId,
+
+    data: {
+      playerId,
+      fromPlanetId,
+      toPlanetId,
+      units,
+      resources,
+      fleetType,
+      allUnitsInThePlanet,
+      allResourcesInThePlanet
+    },
+
+    status: PENDING_TASK_STATUS,
+    isCancellable: false,
+
+    executeTaskAt: executeTaskAt ? getSecond(executeTaskAt) : null,
+    processedAt: null,
+    processingDuration: null,
+
+    history: [
+      {
+        taskStatus: PENDING_TASK_STATUS,
+        updatedAt: new Date().getTime()
+      }
+    ],
+
+    errorDetails: null
+  }
+
+  return startResearchTask
+}
+
+export default createStartFleetTask
diff --git a/packages/game-engine/src/engine/units/calculateCurrentPlayerEnergy.ts b/packages/game-engine/src/engine/units/calculateCurrentPlayerEnergy.ts
index c2a0f0b..bbaee01 100644
--- a/packages/game-engine/src/engine/units/calculateCurrentPlayerEnergy.ts
+++ b/packages/game-engine/src/engine/units/calculateCurrentPlayerEnergy.ts
@@ -1,7 +1,13 @@
+import { IFleet } from '../../types/IFleet'
 import { IPlayer } from '../../types/IPlayer'
+import { IPlayerUnits } from '../../types/IPlayerUnits'
 
-function calculateCurrentPlayerEnergy(player: IPlayer): number {
-  const energyFromFleets = player.fleets.reduce((energyFromFleets, fleet) => {
+function calculateCurrentPlayerEnergy(
+  player: IPlayer,
+  playerUnits: IPlayerUnits[],
+  fleets: IFleet[]
+): number {
+  const energyFromFleets = fleets.reduce((energyFromFleets, fleet) => {
     const fleetEnergy = fleet.units.reduce((fleetEnergy, { unit, amount }) => {
       return fleetEnergy + unit.energyCost * amount
     }, 0)
@@ -9,14 +15,24 @@ function calculateCurrentPlayerEnergy(player: IPlayer): number {
     return energyFromFleets + fleetEnergy
   }, 0)
 
+  const energyFromUnitsInThePlanets = playerUnits.reduce((energyFromPlanets, unitsInThePlanet) => {
+    const planetEnergy = unitsInThePlanet.units.reduce((planetEnergy, { unit, amount }) => {
+      return planetEnergy + unit.energyCost * amount
+    }, 0)
+
+    return energyFromPlanets + planetEnergy
+  }, 0)
+
   // add energy from building units
-  return player.planets.colonies.reduce((totalEnergy, planet) => {
+  const energyFromBuildingUnits = player.planets.colonies.reduce((totalEnergy, planet) => {
     const buildTroopsEnergy = planet.unitBuild.troops.activeBuild?.energy || 0
     const buildSpaceshipsEnergy = planet.unitBuild.spaceships.activeBuild?.energy || 0
     const buildDefensesEnergy = planet.unitBuild.defenses.activeBuild?.energy || 0
 
     return totalEnergy + buildTroopsEnergy + buildSpaceshipsEnergy + buildDefensesEnergy
-  }, energyFromFleets)
+  }, 0)
+
+  return energyFromFleets + energyFromUnitsInThePlanets + energyFromBuildingUnits
 }
 
 export default calculateCurrentPlayerEnergy
diff --git a/packages/game-engine/src/engine/units/calculateCurrentPlayerPopulation.ts b/packages/game-engine/src/engine/units/calculateCurrentPlayerPopulation.ts
index b287d23..30fe5e8 100644
--- a/packages/game-engine/src/engine/units/calculateCurrentPlayerPopulation.ts
+++ b/packages/game-engine/src/engine/units/calculateCurrentPlayerPopulation.ts
@@ -1,7 +1,14 @@
+import { IFleet } from '../../types/IFleet'
 import { IPlayer } from '../../types/IPlayer'
+import { IPlayerUnits } from '../../types/IPlayerUnits'
 
-function calculateCurrentPlayerPopulation(player: IPlayer): number {
-  const population = player.fleets.reduce((population, fleet) => {
+function calculateCurrentPlayerPopulation(
+  player: IPlayer,
+  playerUnits: IPlayerUnits[],
+  fleets: IFleet[]
+): number {
+  // fleet troops
+  const fleetPopulation = fleets.reduce((population, fleet) => {
     const fleetPopulation = fleet.units.reduce((fleetPopulation, { unit, amount }) => {
       return unit.type === 'TROOP' ? fleetPopulation + amount : fleetPopulation
     }, 0)
@@ -9,12 +16,23 @@ function calculateCurrentPlayerPopulation(player: IPlayer): number {
     return population + fleetPopulation
   }, 0)
 
-  // add troops under construction
-  return player.planets.colonies.reduce((energy, planet) => {
+  // fleet troops
+  const planetPopulation = playerUnits.reduce((population, playerUnit) => {
+    const planetPopulation = playerUnit.units.reduce((planetPopulation, { unit, amount }) => {
+      return unit.type === 'TROOP' ? planetPopulation + amount : planetPopulation
+    }, 0)
+
+    return population + planetPopulation
+  }, 0)
+
+  // troops under construction
+  const populationUnderConstruction = player.planets.colonies.reduce((energy, planet) => {
     const amount = planet.unitBuild.troops.activeBuild?.amount || 0
 
     return energy + amount
-  }, population)
+  }, 0)
+
+  return fleetPopulation + planetPopulation + populationUnderConstruction
 }
 
 export default calculateCurrentPlayerPopulation
diff --git a/packages/game-engine/src/engine/units/getAmountOfPlayerUnitsInThePlanet.ts b/packages/game-engine/src/engine/units/getAmountOfPlayerUnitsInThePlanet.ts
deleted file mode 100644
index 3602e7a..0000000
--- a/packages/game-engine/src/engine/units/getAmountOfPlayerUnitsInThePlanet.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { IPlanet } from '../../types/IPlanet'
-import { IPlayer } from '../../types/IPlayer'
-import { IUnit } from '../../types/IUnit'
-import isPlanetCoordinates from '../planets/isPlanetCoordinates'
-
-function getAmountOfPlayerUnitsInThePlanet(player: IPlayer, planet: IPlanet, unit: IUnit): number {
-  const planetFleet = player.fleets.find(
-    (fleet) => isPlanetCoordinates(fleet.planet, planet.coordinates) && !fleet.travel
-  )
-
-  const fleetUnit = planetFleet?.units.find((fleetUnit) => fleetUnit.unit.name === unit.name)
-
-  return fleetUnit?.amount || 0
-}
-
-export default getAmountOfPlayerUnitsInThePlanet
diff --git a/packages/game-engine/src/engine/units/getTotalAmountOfUnits.ts b/packages/game-engine/src/engine/units/getTotalAmountOfUnits.ts
index 6a42b22..4dfcc88 100644
--- a/packages/game-engine/src/engine/units/getTotalAmountOfUnits.ts
+++ b/packages/game-engine/src/engine/units/getTotalAmountOfUnits.ts
@@ -1,8 +1,8 @@
-import { IPlayer } from '../../types/IPlayer'
+import { IPlayerUnits } from '../../types/IPlayerUnits'
 import { IUnit } from '../../types/IUnit'
 
-function getTotalAmountOfUnits(player: IPlayer, unit: IUnit): number {
-  return player.fleets.reduce((totalAmountOfUnits, playerFleet) => {
+function getTotalAmountOfUnits(playerUnits: IPlayerUnits[], unit: IUnit): number {
+  return playerUnits.reduce((totalAmountOfUnits, playerFleet) => {
     const fleetUnit = playerFleet.units.find((fleetUnit) => fleetUnit.unit.name === unit.name)
 
     return fleetUnit ? totalAmountOfUnits + fleetUnit.amount : totalAmountOfUnits
diff --git a/packages/game-engine/src/engine/units/isHeroAlreadyBuild.ts b/packages/game-engine/src/engine/units/isHeroAlreadyBuild.ts
index 8b4380b..06c533d 100644
--- a/packages/game-engine/src/engine/units/isHeroAlreadyBuild.ts
+++ b/packages/game-engine/src/engine/units/isHeroAlreadyBuild.ts
@@ -1,10 +1,10 @@
-import { IFleet } from '../../types/IFleet'
+import { IPlayerUnits } from '../../types/IPlayerUnits'
 import { IUnit } from '../../types/IUnit'
 
-function isHeroAlreadyBuild(unit: IUnit, fleets: IFleet[]): boolean {
+function isHeroAlreadyBuild(unit: IUnit, playerUnits: IPlayerUnits[]): boolean {
   return (
     unit.isHero &&
-    !!fleets.find((fleet) => fleet.units.some((fleetUnit) => fleetUnit.unit.name === unit.name))
+    !!playerUnits.find(({ units }) => units.some(({ unit }) => unit.name === unit.name))
   )
 }
 
diff --git a/packages/game-engine/src/engine/units/isValidUnitAmount.ts b/packages/game-engine/src/engine/units/isValidUnitAmount.ts
index 794125a..d6e9584 100644
--- a/packages/game-engine/src/engine/units/isValidUnitAmount.ts
+++ b/packages/game-engine/src/engine/units/isValidUnitAmount.ts
@@ -1,11 +1,19 @@
+import { IFleet } from '../../types/IFleet'
 import { IPlayer } from '../../types/IPlayer'
+import { IPlayerUnits } from '../../types/IPlayerUnits'
 import { IUnit } from '../../types/IUnit'
 import calculateCurrentPlayerEnergy from './calculateCurrentPlayerEnergy'
 import calculateCurrentPlayerPopulation from './calculateCurrentPlayerPopulation'
 import calculateMaxPlayerEnergy from './calculateMaxPlayerEnergy'
 import calculateMaxPlayerPopulation from './calculateMaxPlayerPopulation'
 
-function isValidUnitAmount(unit: IUnit, amount: number, player: IPlayer): boolean {
+function isValidUnitAmount(
+  unit: IUnit,
+  amount: number,
+  player: IPlayer,
+  playerUnits: IPlayerUnits[],
+  fleets: IFleet[]
+): boolean {
   const isValidAmountValue = unit.isHero ? amount === 1 : amount > 0
 
   if (!isValidAmountValue) {
@@ -14,14 +22,14 @@ function isValidUnitAmount(unit: IUnit, amount: number, player: IPlayer): boolea
 
   if (unit.type === 'TROOP') {
     const playerMaxPopulation = calculateMaxPlayerPopulation(player)
-    const currentPlayerPopulation = calculateCurrentPlayerPopulation(player)
+    const currentPlayerPopulation = calculateCurrentPlayerPopulation(player, playerUnits, fleets)
 
     return currentPlayerPopulation + amount <= playerMaxPopulation
   }
 
   if (unit.type === 'SPACESHIP') {
     const playerMaxEnergy = calculateMaxPlayerEnergy(player)
-    const currentPlayerEnergy = calculateCurrentPlayerEnergy(player)
+    const currentPlayerEnergy = calculateCurrentPlayerEnergy(player, playerUnits, fleets)
 
     return currentPlayerEnergy + amount * unit.energyCost <= playerMaxEnergy
   }
diff --git a/packages/game-engine/src/helpers/generatePlanets.ts b/packages/game-engine/src/helpers/generatePlanets.ts
index ff238dc..509ad94 100644
--- a/packages/game-engine/src/helpers/generatePlanets.ts
+++ b/packages/game-engine/src/helpers/generatePlanets.ts
@@ -66,6 +66,8 @@ function generatePlanets(universe: IUniverseDocument): IPlanet[] {
               }
             },
 
+            exploredBy: [],
+
             units: []
           })
         }
diff --git a/packages/game-engine/src/index.ts b/packages/game-engine/src/index.ts
index c90f67f..5912856 100644
--- a/packages/game-engine/src/index.ts
+++ b/packages/game-engine/src/index.ts
@@ -5,6 +5,7 @@ import gameEngine from './engine/game-engine'
 import './models/ResearchModel'
 import './models/UnitModel'
 import './models/FleetModel'
+import './models/PlayerUnitsModel'
 
 const ONE_SECOND_INTERVAL = 1_000
 
diff --git a/packages/game-engine/src/models/FleetModel.ts b/packages/game-engine/src/models/FleetModel.ts
index e1da170..be8c568 100644
--- a/packages/game-engine/src/models/FleetModel.ts
+++ b/packages/game-engine/src/models/FleetModel.ts
@@ -12,49 +12,38 @@ const FleetUnitsSchema = new Schema(
   { _id: false }
 )
 
-const FleetTravelSchema = new Schema(
-  {
-    destination: { type: Schema.Types.ObjectId, ref: 'Planet', required: true },
-    arriveAt: { type: Number, required: true },
-    fleetType: { type: Number, required: true }, // TODO: create a fleetType
-    isReturning: { type: Boolean, required: true, default: false },
-    resources: { type: Number, required: true, default: 0 }
-  },
-  { _id: false }
-)
-
 export const FleetSchema = new Schema({
-  planet: { type: Schema.Types.ObjectId, ref: 'Planet', required: true },
-
   playerId: { type: String, required: true },
 
   units: [FleetUnitsSchema],
 
-  travel: { type: FleetTravelSchema, required: false, default: undefined }
+  isReturning: { type: Boolean, required: true, default: false },
+  isFinished: { type: Boolean, required: true, default: false },
+
+  fromPlanet: { type: Schema.Types.ObjectId, ref: 'Planet', required: true },
+  toPlanet: { type: Schema.Types.ObjectId, ref: 'Planet', required: true },
+
+  arriveAt: { type: Number, required: true },
+  startedAt: { type: Number, required: true },
+  duration: { type: Number, required: true },
+
+  fleetType: { type: String, required: true },
+  resources: { type: Number, required: true, default: 0 },
+  taskId: { type: String, required: false }
 })
 
 export interface IFleetDocument extends IFleet, Document {
   _id: Types.ObjectId
 
-  planet: IPlanetDocument
-
-  playerId: string
-
   units: {
     amount: number
     unit: IUnitDocument
   }[]
 
-  travel?: {
-    destination: IPlanetDocument
-    arriveAt: number
-    fleetType: string // TODO: create a fleetType
-    isReturning: boolean
-    resources: number
-  }
+  fromPlanet: IPlanetDocument
+  toPlanet: IPlanetDocument
 }
 
-// TODO: delete this ???? => use player.fleets [] ONLY
 const FleetModel: Model<IFleetDocument> = mongoose.model<IFleetDocument>('Fleet', FleetSchema)
 
 export default FleetModel
diff --git a/packages/game-engine/src/models/PlanetModel.ts b/packages/game-engine/src/models/PlanetModel.ts
index f140564..5380804 100644
--- a/packages/game-engine/src/models/PlanetModel.ts
+++ b/packages/game-engine/src/models/PlanetModel.ts
@@ -74,7 +74,9 @@ const PlanetSchema: Schema = new Schema(
         ref: 'Unit',
         required: true
       }
-    ]
+    ],
+
+    exploredBy: [{ type: String, default: [] }]
   },
   {
     timestamps: true
@@ -85,6 +87,8 @@ export interface IPlanetDocument extends IPlanet, Document {
   _id: mongoose.Types.ObjectId
 
   units: IUnitDocument[]
+
+  exploredBy: string[]
 }
 
 const PlanetModel: Model<IPlanetDocument> = mongoose.model<IPlanetDocument>('Planet', PlanetSchema)
diff --git a/packages/game-engine/src/models/PlayerModel.ts b/packages/game-engine/src/models/PlayerModel.ts
index d08d4fc..b495b51 100644
--- a/packages/game-engine/src/models/PlayerModel.ts
+++ b/packages/game-engine/src/models/PlayerModel.ts
@@ -5,7 +5,6 @@ import { IPlayer } from '../types/IPlayer'
 import { IRaceDocument } from './RaceModel'
 import { IResearchDocument } from './ResearchModel'
 import { IPlanetDocument } from './PlanetModel'
-import { FleetSchema, IFleetDocument } from './FleetModel'
 
 const ActiveResearchSchema = new Schema(
   {
@@ -56,9 +55,7 @@ const PlayerSchema: Schema = new Schema({
       default: undefined
     },
     queue: [{ type: String }]
-  },
-
-  fleets: [FleetSchema]
+  }
 })
 
 interface IPlayerResearchDocument {
@@ -87,8 +84,6 @@ export interface IPlayerDocument extends IPlayer, Document {
     principal: IPlanetDocument
     colonies: IPlanetDocument[]
   }
-
-  fleets: IFleetDocument[]
 }
 
 const PlayerModel: Model<IPlayerDocument> = mongoose.model<IPlayerDocument>('Player', PlayerSchema)
diff --git a/packages/game-engine/src/models/PlayerUnitsModel.ts b/packages/game-engine/src/models/PlayerUnitsModel.ts
new file mode 100644
index 0000000..60c2543
--- /dev/null
+++ b/packages/game-engine/src/models/PlayerUnitsModel.ts
@@ -0,0 +1,39 @@
+import mongoose, { Schema, Model, Types, Document } from 'mongoose'
+import { IPlayerUnits } from '../types/IPlayerUnits'
+import { IPlanetDocument } from './PlanetModel'
+import { IUnitDocument } from './UnitModel'
+import { IPlayerDocument } from './PlayerModel'
+
+const PlanetUnitsSchema = new Schema(
+  {
+    unit: { type: Schema.Types.ObjectId, ref: 'Unit' },
+    amount: { type: Number }
+  },
+  { _id: false }
+)
+
+const PlayerUnitsSchema = new Schema({
+  player: { type: Schema.Types.ObjectId, ref: 'Player', required: true },
+  units: [PlanetUnitsSchema],
+  planet: { type: Schema.Types.ObjectId, ref: 'Planet', required: true }
+})
+
+export interface IPlayerUnitsDocument extends IPlayerUnits, Document {
+  _id: Types.ObjectId
+
+  player: IPlayerDocument
+
+  units: {
+    amount: number
+    unit: IUnitDocument
+  }[]
+
+  planet: IPlanetDocument
+}
+
+const PlayerUnitsModel: Model<IPlayerUnitsDocument> = mongoose.model<IPlayerUnitsDocument>(
+  'PlayerUnits',
+  PlayerUnitsSchema
+)
+
+export default PlayerUnitsModel
diff --git a/packages/game-engine/src/repositories/fleetRepository.ts b/packages/game-engine/src/repositories/fleetRepository.ts
new file mode 100644
index 0000000..f26c16b
--- /dev/null
+++ b/packages/game-engine/src/repositories/fleetRepository.ts
@@ -0,0 +1,71 @@
+import FleetModel from '../models/FleetModel'
+
+async function findFleetsByPlayerId(playerId: string) {
+  return FleetModel.find({
+    playerId,
+    isFinished: false
+  })
+    .populate({
+      path: 'units.unit',
+      populate: {
+        path: 'requirements.researches.research',
+        model: 'Research'
+      }
+    })
+    .populate('fromPlanet')
+    .populate('toPlanet')
+}
+
+async function findFleetsByFromPlanetId(planetId: string) {
+  return FleetModel.find({
+    fromPlanet: planetId,
+    isFinished: false
+  })
+    .populate({
+      path: 'units.unit',
+      populate: {
+        path: 'requirements.researches.research',
+        model: 'Research'
+      }
+    })
+    .populate('fromPlanet')
+    .populate('toPlanet')
+}
+
+async function findFleetsByToPlanetId(planetId: string) {
+  return FleetModel.find({
+    toPlanet: planetId,
+    isFinished: false
+  })
+    .populate({
+      path: 'units.unit',
+      populate: {
+        path: 'requirements.researches.research',
+        model: 'Research'
+      }
+    })
+    .populate('fromPlanet')
+    .populate('toPlanet')
+}
+
+async function findFleetById(fleetId: string) {
+  return FleetModel.findById(fleetId)
+    .populate({
+      path: 'units.unit',
+      populate: {
+        path: 'requirements.researches.research',
+        model: 'Research'
+      }
+    })
+    .populate('fromPlanet')
+    .populate('toPlanet')
+}
+
+const fleetRepository = {
+  findFleetById,
+  findFleetsByPlayerId,
+  findFleetsByToPlanetId,
+  findFleetsByFromPlanetId
+}
+
+export default fleetRepository
diff --git a/packages/game-engine/src/repositories/planetRepository.ts b/packages/game-engine/src/repositories/planetRepository.ts
index 3cda4f6..ae72501 100644
--- a/packages/game-engine/src/repositories/planetRepository.ts
+++ b/packages/game-engine/src/repositories/planetRepository.ts
@@ -21,16 +21,23 @@ async function findPlanetByCoordinates(coordinates: IPlanetCoordinates) {
   }).exec()
 }
 
+async function findPlanetsBySystem(galaxy: number, sector: number, system: number) {
+  return PlanetModel.find({
+    'coordinates.galaxy': galaxy,
+    'coordinates.sector': sector,
+    'coordinates.system': system
+  }).exec()
+}
+
 async function insertPlanets(planets: IPlanet[]) {
   return PlanetModel.insertMany(planets)
 }
 
-// TODO: findPlanetsBySystem? => return all planets of a system
-
 const planetRepository = {
   findPlanetById,
   findPlanetByCoordinates,
   findAvailablePrincipalPlanets,
+  findPlanetsBySystem,
   insertPlanets
 }
 
diff --git a/packages/game-engine/src/repositories/playerRepository.ts b/packages/game-engine/src/repositories/playerRepository.ts
index a9e0604..c68cbc0 100644
--- a/packages/game-engine/src/repositories/playerRepository.ts
+++ b/packages/game-engine/src/repositories/playerRepository.ts
@@ -50,27 +50,6 @@ async function findPlayerByUsername(username: string, universeId: string) {
         model: 'Research'
       }
     })
-    .populate({
-      path: 'fleets',
-      populate: [
-        {
-          path: 'planet',
-          model: 'Planet'
-        },
-        {
-          path: 'units.unit',
-          model: 'Unit',
-          populate: {
-            path: 'requirements.researches.research',
-            model: 'Research'
-          }
-        },
-        {
-          path: 'travel.destination',
-          model: 'Planet'
-        }
-      ]
-    })
     .exec()
 }
 
@@ -124,27 +103,6 @@ async function findPlayerById(playerId: string) {
         model: 'Research'
       }
     })
-    .populate({
-      path: 'fleets',
-      populate: [
-        {
-          path: 'planet',
-          model: 'Planet'
-        },
-        {
-          path: 'units.unit',
-          model: 'Unit',
-          populate: {
-            path: 'requirements.researches.research',
-            model: 'Research'
-          }
-        },
-        {
-          path: 'travel.destination',
-          model: 'Planet'
-        }
-      ]
-    })
     .exec()
 }
 
diff --git a/packages/game-engine/src/repositories/playerUnitsRepository.ts b/packages/game-engine/src/repositories/playerUnitsRepository.ts
new file mode 100644
index 0000000..635b3f7
--- /dev/null
+++ b/packages/game-engine/src/repositories/playerUnitsRepository.ts
@@ -0,0 +1,69 @@
+import PlayerUnitsModel from '../models/PlayerUnitsModel'
+
+async function findPlayerUnitsById(unitsInThePlanetId: string) {
+  return PlayerUnitsModel.findById(unitsInThePlanetId)
+    .populate('player')
+    .populate({
+      path: 'units.unit',
+      populate: {
+        path: 'requirements.researches.research',
+        model: 'Research'
+      }
+    })
+    .populate('planet')
+}
+
+async function findPlayerUnits(playerId: string) {
+  return PlayerUnitsModel.find({
+    player: playerId
+  })
+    .populate('player')
+    .populate({
+      path: 'units.unit',
+      populate: {
+        path: 'requirements.researches.research',
+        model: 'Research'
+      }
+    })
+    .populate('planet')
+}
+
+async function findUnitsInThePlanet(planetId: string) {
+  return PlayerUnitsModel.find({
+    planet: planetId
+  })
+    .populate('player')
+    .populate({
+      path: 'units.unit',
+      populate: {
+        path: 'requirements.researches.research',
+        model: 'Research'
+      }
+    })
+    .populate('planet')
+}
+
+async function findPlayerUnitsInThePlanet(playerId: string, planetId: string) {
+  return PlayerUnitsModel.findOne({
+    player: playerId,
+    planet: planetId
+  })
+    .populate('player')
+    .populate({
+      path: 'units.unit',
+      populate: {
+        path: 'requirements.researches.research',
+        model: 'Research'
+      }
+    })
+    .populate('planet')
+}
+
+const playerUnitsRepository = {
+  findPlayerUnitsById,
+  findPlayerUnits,
+  findUnitsInThePlanet,
+  findPlayerUnitsInThePlanet
+}
+
+export default playerUnitsRepository
diff --git a/packages/game-engine/src/repositories/taskRepository.ts b/packages/game-engine/src/repositories/taskRepository.ts
index 6f381d4..9e3ec21 100644
--- a/packages/game-engine/src/repositories/taskRepository.ts
+++ b/packages/game-engine/src/repositories/taskRepository.ts
@@ -7,6 +7,7 @@ import {
   NewPlayerTaskType,
   PENDING_TASK_STATUS,
   StartBuildUnitsTaskType,
+  StartFleetTaskType,
   StartResearchTaskType,
   TaskType
 } from '../types/ITask'
@@ -33,7 +34,7 @@ async function getPendingTasksByType(
       status: PENDING_TASK_STATUS,
       universeId,
       type,
-      $or: [{ executeTaskAt: { $lt: second } }, { executeTaskAt: null }]
+      $or: [{ executeTaskAt: { $lt: second } }, { executeTaskAt: null }, { executeTaskAt: second }]
     })
     .exec()
 }
@@ -56,6 +57,12 @@ async function createStartBuildUnitsTask(taskData: ITask<StartBuildUnitsTaskType
   return newStartBuildUnitsTask.save()
 }
 
+async function createStartFleetTask(taskData: ITask<StartFleetTaskType>) {
+  const newFleetTaskModel = getTaskModel<StartFleetTaskType>()
+  const newFleetTask = new newFleetTaskModel(taskData)
+  return newFleetTask.save()
+}
+
 async function findNewPlayerTaskByUsername(
   username: string,
   universeId: mongoose.Types.ObjectId,
@@ -78,6 +85,7 @@ async function findTaskById<Type extends TaskType>(taskId: mongoose.Types.Object
 const taskRepository = {
   findTaskById,
   createPlayerTask,
+  createStartFleetTask,
   createStartResearchTask,
   createStartBuildUnitsTask,
   getPendingTasks,
diff --git a/packages/game-engine/src/repositories/unitRepository.ts b/packages/game-engine/src/repositories/unitRepository.ts
index cc86f68..726b2ca 100644
--- a/packages/game-engine/src/repositories/unitRepository.ts
+++ b/packages/game-engine/src/repositories/unitRepository.ts
@@ -11,6 +11,10 @@ async function findUnitById(unitId: mongoose.Types.ObjectId) {
   return UnitModel.findById(unitId).exec()
 }
 
+async function findUnitByName(name: string) {
+  return UnitModel.findOne({ name }).exec()
+}
+
 async function insertUnits(units: IUnit[]) {
   return UnitModel.insertMany(units)
 }
@@ -18,7 +22,8 @@ async function insertUnits(units: IUnit[]) {
 const unitRepository = {
   findUnits,
   insertUnits,
-  findUnitById
+  findUnitById,
+  findUnitByName
 }
 
 export default unitRepository
diff --git a/packages/game-engine/src/test/createNewPlayerTask.test.ts b/packages/game-engine/src/test/createNewPlayerTask.test.ts
index 246e37d..f8a149a 100644
--- a/packages/game-engine/src/test/createNewPlayerTask.test.ts
+++ b/packages/game-engine/src/test/createNewPlayerTask.test.ts
@@ -139,8 +139,8 @@ describe('process new player creation Task', () => {
     expect(createdPlayer!.researches.researched).toEqual([])
     expect(createdPlayer!.researches.activeResearch).toBeUndefined()
 
-    expect(calculateCurrentPlayerPopulation(createdPlayer!)).toEqual(0)
-    expect(calculateCurrentPlayerEnergy(createdPlayer!)).toEqual(0)
+    expect(calculateCurrentPlayerPopulation(createdPlayer!, [], [])).toEqual(0)
+    expect(calculateCurrentPlayerEnergy(createdPlayer!, [], [])).toEqual(0)
 
     const populationResearch = createdPlayer!.researches.researched.find(
       ({ research }) => research.isTroopsPopulationResearch
@@ -399,9 +399,7 @@ describe('process new player creation Task', () => {
       researches: {
         researched: [],
         queue: []
-      },
-
-      fleets: []
+      }
     }
 
     await PlayerModel.create(newPlayerData)
diff --git a/packages/game-engine/src/test/mocks/planetMocks.ts b/packages/game-engine/src/test/mocks/planetMocks.ts
index c185ff8..b59b70b 100644
--- a/packages/game-engine/src/test/mocks/planetMocks.ts
+++ b/packages/game-engine/src/test/mocks/planetMocks.ts
@@ -40,7 +40,9 @@ export const PRINCIPAL_PLANET_TEST_1: IPlanet = {
     }
   },
 
-  units: []
+  units: [],
+
+  exploredBy: []
 }
 
 export const AVAILABLE_PLANET_TEST_1: IPlanet = {
@@ -82,7 +84,9 @@ export const AVAILABLE_PLANET_TEST_1: IPlanet = {
     }
   },
 
-  units: []
+  units: [],
+
+  exploredBy: []
 }
 
 const ALL_PLANETS_MOCK = [PRINCIPAL_PLANET_TEST_1, AVAILABLE_PLANET_TEST_1]
diff --git a/packages/game-engine/src/test/mocks/playerMocks.ts b/packages/game-engine/src/test/mocks/playerMocks.ts
index 8e5746e..c6cf76e 100644
--- a/packages/game-engine/src/test/mocks/playerMocks.ts
+++ b/packages/game-engine/src/test/mocks/playerMocks.ts
@@ -21,9 +21,7 @@ export const PLAYER_TEST_1_PIRATE: IPlayer = {
   researches: {
     researched: [],
     queue: []
-  },
-
-  fleets: []
+  }
 }
 
 const ALL_PLAYERS_MOCK = [PLAYER_TEST_1_PIRATE]
diff --git a/packages/game-engine/src/types/IFleet.ts b/packages/game-engine/src/types/IFleet.ts
index 8b29eab..858bc70 100644
--- a/packages/game-engine/src/types/IFleet.ts
+++ b/packages/game-engine/src/types/IFleet.ts
@@ -1,25 +1,26 @@
 import { IPlanet } from './IPlanet'
 import { IUnit } from './IUnit'
 
-interface IFleetUnits {
+export interface IFleetUnits {
   unit: IUnit
   amount: number
 }
 
-interface ITravelFleet {
-  destination: IPlanet
-  arriveAt: number
-  fleetType: string // TODO: create a fleetType
-  isReturning: boolean
-  resources: number
-}
+export type ExploreFleetType = 'EXPLORE_FLEET_TYPE'
+
+export type FleetTypes = ExploreFleetType
 
 export interface IFleet {
   playerId: string
-
-  planet: IPlanet
-
   units: IFleetUnits[]
-
-  travel?: ITravelFleet
+  isReturning: boolean
+  isFinished: boolean
+  fromPlanet: IPlanet
+  toPlanet: IPlanet
+  arriveAt: number
+  startedAt: number
+  duration: number
+  fleetType: FleetTypes
+  resources: number
+  taskId?: string
 }
diff --git a/packages/game-engine/src/types/IPlanet.ts b/packages/game-engine/src/types/IPlanet.ts
index ae232c3..bb7a5cd 100644
--- a/packages/game-engine/src/types/IPlanet.ts
+++ b/packages/game-engine/src/types/IPlanet.ts
@@ -55,4 +55,6 @@ export interface IPlanet {
   }
 
   units: IUnit[]
+
+  exploredBy: string[]
 }
diff --git a/packages/game-engine/src/types/IPlayer.ts b/packages/game-engine/src/types/IPlayer.ts
index 07aad45..bb711f6 100644
--- a/packages/game-engine/src/types/IPlayer.ts
+++ b/packages/game-engine/src/types/IPlayer.ts
@@ -2,7 +2,6 @@ import { IBonus } from './IBonus'
 import { IPlanet } from './IPlanet'
 import { IResearch } from './IResearch'
 import { IRace } from './IRace'
-import { IFleet } from './IFleet'
 
 interface IPlayerUser {
   username: string
@@ -46,6 +45,4 @@ export interface IPlayer {
   planets: IPlayerPlanets
   perks: IPlayerPerk[]
   researches: IPlayerResearches
-  fleets: IFleet[]
-  // TODO: ADD pendingTasksHere ???
 }
diff --git a/packages/game-engine/src/types/IPlayerUnits.ts b/packages/game-engine/src/types/IPlayerUnits.ts
new file mode 100644
index 0000000..fc0a51d
--- /dev/null
+++ b/packages/game-engine/src/types/IPlayerUnits.ts
@@ -0,0 +1,14 @@
+import { IPlanet } from './IPlanet'
+import { IPlayer } from './IPlayer'
+import { IUnit } from './IUnit'
+
+export interface IPlanetUnits {
+  unit: IUnit
+  amount: number
+}
+
+export type IPlayerUnits = {
+  player: IPlayer
+  units: IPlanetUnits[]
+  planet: IPlanet
+}
diff --git a/packages/game-engine/src/types/ITask.ts b/packages/game-engine/src/types/ITask.ts
index 184cff5..dc7ab12 100644
--- a/packages/game-engine/src/types/ITask.ts
+++ b/packages/game-engine/src/types/ITask.ts
@@ -1,3 +1,4 @@
+import { FleetTypes, IFleetUnits } from './IFleet'
 import { UnitTypes } from './IUnit'
 
 export const PENDING_TASK_STATUS = 'PENDING'
@@ -61,11 +62,34 @@ export type FinishBuildUnitsTaskData = {
   }
 }
 
-// const EXPLORE_PLANET_TASK_TYPE = 'ExplorePlanetTask'
-// export type ExplorePlanetTaskType = typeof EXPLORE_PLANET_TASK_TYPE
-// export type ExplorePlanetTaskData = {
-//   // TODO: implement task data
-// }
+export const START_FLEET_TASK_TYPE = 'START_FLEET_UNITS_TASK'
+export type StartFleetTaskType = typeof START_FLEET_TASK_TYPE
+export type StartFleetTaskData = {
+  playerId: string
+  fromPlanetId: string
+  toPlanetId: string
+  units: IFleetUnits[]
+  resources: number
+  fleetType: FleetTypes
+  allUnitsInThePlanet?: boolean
+  allResourcesInThePlanet?: boolean
+}
+
+export const FINISH_FLEET_TASK_TYPE = 'FINISH_FLEET_UNITS_TASK'
+export type FinishFleetTaskType = typeof FINISH_FLEET_TASK_TYPE
+export type FinishFleetTaskData = {
+  playerId: string
+  fromPlanetId: string
+  toPlanetId: string
+  units: IFleetUnits[]
+  resources: number
+  fleetType: FleetTypes
+  allUnitsInThePlanet?: boolean
+  allResourcesInThePlanet?: boolean
+  isReturning: boolean
+  arriveAt: number
+  fleetId: string
+}
 
 export type TaskType =
   | NewPlayerTaskType
@@ -73,6 +97,8 @@ export type TaskType =
   | FinishResearchTaskType
   | StartBuildUnitsTaskType
   | FinishBuildUnitsTaskType
+  | StartFleetTaskType
+  | FinishFleetTaskType
 
 export type TaskData<T extends TaskType> = T extends NewPlayerTaskType
   ? NewPlayerTaskData
@@ -84,7 +110,11 @@ export type TaskData<T extends TaskType> = T extends NewPlayerTaskType
         ? StartBuildUnitsTaskData
         : T extends FinishBuildUnitsTaskType
           ? FinishBuildUnitsTaskData
-          : never
+          : T extends StartFleetTaskType
+            ? StartFleetTaskData
+            : T extends FinishFleetTaskType
+              ? FinishFleetTaskData
+              : never
 
 type HistoryStatusItem = {
   taskStatus: TaskStatus
diff --git a/packages/game-engine/src/types/IUnit.ts b/packages/game-engine/src/types/IUnit.ts
index dcd1046..c7a1bbd 100644
--- a/packages/game-engine/src/types/IUnit.ts
+++ b/packages/game-engine/src/types/IUnit.ts
@@ -18,42 +18,22 @@ type UnitStatsTypes = {
   troopsCapacity: number
 }
 
-// TODO: troops subtypes
+// troops
 type UnitTroopInfantrySubtype = 'INFANTRY'
 type UnitTroopMedicSubtype = 'MEDIC'
 
-// TODO: spaceship subtypes
+// spaceship
 type UnitSpaceshipProbeSubtype = 'PROBE'
 type UnitSpaceshipStarFighterSubtype = 'STAR_FIGHTER'
-// TODO: Implement the INTERCEPTOR_STAR_FIGHTER subtype to be effective against other StarFighters and less effective against other unit types.
 type UnitSpaceshipCruiserSubtype = 'CRUISER'
 type UnitSpaceshipFrigateSubtype = 'FRIGATE'
+type UnitSpaceshipDestroyerSubtype = 'DESTROYER'
+type UnitSpaceshipCarrierSubtype = 'CARRIER'
 type UnitSpaceshipBattleStationSubtype = 'BATTLE_STATION'
 
-// TODO: defenses subtypes
+// defenses
 type UnitDefenseSubtype = 'DEFENSE'
 
-// export type SpaceScoutDrone = 'spaceScoutDrone'
-// export type SpaceFighter = 'spaceFighter'
-// export type SpaceCarrier = 'spaceCarrier'
-// export type SpaceCruiser = 'spaceCruiser'
-// export type SpaceDestroyer = 'spaceDestroyer'
-// export type SpaceBattleStation = 'spaceBattleStation'
-// export type SpacePlanetaryBomber = 'spacePlanetaryBomber'
-// export type SpaceCargo = 'spaceCargo'
-
-// // TODO: move this to Units ?
-// export type ShipsTypes =
-//   | SpaceScoutDrone
-//   | SpaceFighter
-//   | SpaceCarrier
-//   | SpaceCruiser
-//   | SpaceDestroyer
-//   | SpaceFrigate
-//   | SpaceBattleStation
-//   | SpacePlanetaryBomber
-//   | SpaceCargo
-
 type UnitSubtypes =
   | UnitTroopInfantrySubtype
   | UnitTroopMedicSubtype
@@ -61,6 +41,8 @@ type UnitSubtypes =
   | UnitSpaceshipStarFighterSubtype
   | UnitSpaceshipCruiserSubtype
   | UnitSpaceshipFrigateSubtype
+  | UnitSpaceshipDestroyerSubtype
+  | UnitSpaceshipCarrierSubtype
   | UnitSpaceshipBattleStationSubtype
   | UnitDefenseSubtype