diff --git a/README.md b/README.md
index b3bb57e..17cec7a 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,13 @@
 
 **PokéNurse** is a desktop application for Windows and Mac that allows you to manage your pokémon from Pokémon Go without the need for a mobile device. You can now favorite, transfer, and evolve from the comfort of your own home!
 
-## Downloads for v1.4.0
+## Downloads for v1.5.0
 You may view all the releases [here](https://github.com/vinnymac/PokeNurse/releases)
-* [Mac OS X](https://github.com/vinnymac/PokeNurse/releases/download/v1.4.0/PokeNurse-darwin-x64.zip)
-* [Windows 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.4.0/PokeNurse-win32-ia32.zip)
-* [Windows 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.4.0/PokeNurse-win32-x64.zip)
-* [Linux 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.4.0/PokeNurse-linux-ia32.zip)
-* [Linux 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.4.0/PokeNurse-linux-x64.zip)
+* [Mac OS X](https://github.com/vinnymac/PokeNurse/releases/download/v1.5.0/PokeNurse-darwin-x64.zip)
+* [Windows 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.5.0/PokeNurse-win32-ia32.zip)
+* [Windows 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.5.0/PokeNurse-win32-x64.zip)
+* [Linux 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.5.0/PokeNurse-linux-ia32.zip)
+* [Linux 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.5.0/PokeNurse-linux-x64.zip)
 
 ## Examples
 ![Login Window](app/loginExample.png)
diff --git a/app/actions/authenticate.js b/app/actions/authenticate.js
new file mode 100644
index 0000000..04b8e2b
--- /dev/null
+++ b/app/actions/authenticate.js
@@ -0,0 +1,91 @@
+import path from 'path'
+import pogobuf from 'pogobuf'
+import {
+  remote
+} from 'electron'
+import {
+  createAction
+} from 'redux-actions'
+
+import * as fs from 'async-file'
+
+import client from '../client'
+
+import {
+  getTrainerInfo,
+  getTrainerPokemon
+} from './trainer'
+
+const saveAccountCredentialsFailed = createAction('SAVE_ACCOUNT_CREDENTIALS_FAILED')
+const saveAccountCredentialsSuccess = createAction('SAVE_ACCOUNT_CREDENTIALS_SUCCESS')
+
+const checkAndDeleteCredentialsFailed = createAction('CHECK_AND_DELETE_CREDENTIALS_FAILED')
+const checkAndDeleteCredentialsSuccess = createAction('CHECK_AND_DELETE_CREDENTIALS_SUCCESS')
+
+const userLoginStarted = createAction('USER_LOGIN_STARTED')
+const userLoginSuccess = createAction('USER_LOGIN_SUCCESS')
+const userLoginFailed = createAction('USER_LOGIN_FAILED')
+
+const accountPath = path.join(remote.app.getPath('appData'), '/pokenurse/account.json')
+
+export default {
+  client,
+
+  login({ method, username, password }) {
+    return async (dispatch) => {
+      dispatch(userLoginStarted())
+
+      let login
+      if (method === 'google') {
+        login = new pogobuf.GoogleLogin()
+      } else {
+        login = new pogobuf.PTCLogin()
+      }
+
+      try {
+        const token = await login.login(username, password)
+
+        client.setAuthInfo(method, token)
+        client.init()
+
+        // TODO display a loading spinner
+        // then fetch all necessary things
+        await Promise.all([
+          dispatch(getTrainerInfo()),
+          dispatch(getTrainerPokemon())
+        ])
+
+        dispatch(userLoginSuccess())
+      } catch (error) {
+        console.error(error) // eslint-disable-line
+        dispatch(userLoginFailed({ error }))
+      }
+    }
+  },
+
+  logout: createAction('USER_LOGOUT'),
+
+  checkAndDeleteCredentials() {
+    return async (dispatch) => {
+      try {
+        if (await fs.exists(accountPath)) {
+          await fs.unlink(accountPath)
+        }
+        dispatch(checkAndDeleteCredentialsSuccess())
+      } catch (error) {
+        dispatch(checkAndDeleteCredentialsFailed())
+      }
+    }
+  },
+
+  saveAccountCredentials(credentials) {
+    return async (dispatch) => {
+      try {
+        const response = await fs.writeFile(accountPath, JSON.stringify(credentials))
+        dispatch(saveAccountCredentialsSuccess({ response, credentials }))
+      } catch (error) {
+        dispatch(saveAccountCredentialsFailed(error))
+      }
+    }
+  }
+}
diff --git a/app/actions/index.js b/app/actions/index.js
index 8571a4d..e5b76e6 100644
--- a/app/actions/index.js
+++ b/app/actions/index.js
@@ -1,5 +1,11 @@
 import * as statusActions from './status'
+import * as authenticateActions from './authenticate'
+import * as trainerActions from './trainer'
+import * as settingsActions from './settings'
 
 export default {
-  ...statusActions
+  ...statusActions,
+  ...authenticateActions,
+  ...trainerActions,
+  ...settingsActions,
 }
diff --git a/app/actions/settings.js b/app/actions/settings.js
new file mode 100644
index 0000000..ede5c2f
--- /dev/null
+++ b/app/actions/settings.js
@@ -0,0 +1,13 @@
+import {
+  createAction
+} from 'redux-actions'
+
+export default {
+  toggleShowSpeciesWithZeroPokemon: createAction('TOGGLE_SHOW_SPECIES_WITH_ZERO_POKEMON'),
+  toggleAutoLogin: createAction('TOGGLE_AUTO_LOGIN'),
+  resetAllSettings: createAction('RESET_ALL_SETTINGS'),
+  changeDefaultPokedexSortBy: createAction('CHANGE_DEFAULT_POKEDEX_SORT_BY'),
+  changeDefaultPokedexSortDirection: createAction('CHANGE_DEFAULT_POKEDEX_SORT_DIRECTION'),
+  changeDefaultSpecieSortBy: createAction('CHANGE_DEFAULT_SPECIE_SORT_BY'),
+  changeDefaultSpecieSortDirection: createAction('CHANGE_DEFAULT_SPECIE_SORT_DIRECTION'),
+}
diff --git a/app/actions/trainer.js b/app/actions/trainer.js
new file mode 100644
index 0000000..59c8053
--- /dev/null
+++ b/app/actions/trainer.js
@@ -0,0 +1,289 @@
+import {
+  createAction
+} from 'redux-actions'
+import {
+  times,
+  keyBy,
+} from 'lodash'
+import pogobuf from 'pogobuf'
+import POGOProtos from 'node-pogo-protos'
+
+import client from '../client'
+
+// TODO Must move these helpers to app folder
+import utils from '../utils'
+import baseStats from '../../baseStats'
+
+// Maybe put this info and the helper methods in utils?
+const kantoDexCount = 151
+
+function generateEmptySpecies(candies) {
+  const candiesByFamilyId = keyBy(candies, (candy) => String(candy.family_id))
+
+  return times(kantoDexCount, (i) => {
+    const pokemonDexNumber = String(i + 1)
+    const basePokemon = baseStats.pokemon[pokemonDexNumber]
+
+    const candyByFamilyId = candiesByFamilyId[basePokemon.familyId]
+    const candy = candyByFamilyId ? candyByFamilyId.candy : 0
+
+    return {
+      candy,
+      pokemon_id: pokemonDexNumber,
+      name: basePokemon.name,
+      count: 0,
+      evolves: 0,
+      pokemon: []
+    }
+  })
+}
+
+function parseInventory(inventory) {
+  const { player, candies, pokemon } = pogobuf.Utils.splitInventory(inventory)
+
+  const speciesList = generateEmptySpecies(candies)
+  const eggList = []
+
+  // populates the speciesList with pokemon and counts
+  // populates the eggList with pokemon
+  pokemon.forEach(p => {
+    if (p.is_egg) {
+      eggList.push(p)
+      return
+    }
+
+    let pokemonName = pogobuf.Utils.getEnumKeyByValue(
+      POGOProtos.Enums.PokemonId,
+      p.pokemon_id
+    )
+
+    pokemonName = pokemonName.replace('Female', '♀').replace('Male', '♂')
+
+    const stats = baseStats.pokemon[p.pokemon_id]
+
+    const totalCpMultiplier = p.cp_multiplier + p.additional_cp_multiplier
+
+    const attack = stats.BaseAttack + p.individual_attack
+    const defense = stats.BaseDefense + p.individual_defense
+    const stamina = stats.BaseStamina + p.individual_stamina
+
+    const maxCP = utils.getMaxCpForTrainerLevel(attack, defense, stamina, player.level)
+    const candyCost = utils.getCandyCostsForPowerup(totalCpMultiplier, p.num_upgrades)
+    const stardustCost = utils.getStardustCostsForPowerup(totalCpMultiplier, p.num_upgrades)
+    const candyMaxCost = utils.getMaxCandyCostsForPowerup(
+      player.level,
+      p.num_upgrades,
+      totalCpMultiplier
+    )
+
+    const stardustMaxCost = utils.getMaxStardustCostsForPowerup(
+      player.level,
+      p.num_upgrades,
+      totalCpMultiplier
+    )
+
+    const nextCP = utils.getCpAfterPowerup(p.cp, totalCpMultiplier)
+
+    const iv = utils.getIVs(p)
+
+    // TODO Use CamelCase instead of under_score for all keys except responses
+    const pokemonWithStats = {
+      iv,
+      cp: p.cp,
+      next_cp: nextCP,
+      max_cp: maxCP,
+      candy_cost: candyCost,
+      candy_max_cost: candyMaxCost,
+      stardust_cost: stardustCost,
+      stardust_max_cost: stardustMaxCost,
+      creation_time_ms: p.creation_time_ms.toString(),
+      deployed: p.deployed_fort_id !== '',
+      id: p.id.toString(),
+      attack: p.individual_attack,
+      defense: p.individual_defense,
+      stamina: p.individual_stamina,
+      current_stamina: p.stamina,
+      stamina_max: p.stamina_max,
+      pokemon_id: p.pokemon_id,
+      name: pokemonName,
+      height: p.height_m,
+      weight: p.weight_kg,
+      nickname: p.nickname || pokemonName,
+      // Multiply by -1 for sorting
+      favorite: p.favorite * -1,
+      move_1: p.move_1,
+      move_2: p.move_2
+    }
+
+    const speciesIndex = p.pokemon_id - 1
+
+    speciesList[speciesIndex].count += 1
+    speciesList[speciesIndex].pokemon.push(pokemonWithStats)
+  })
+
+  // TODO use map
+  speciesList.forEach((s) => {
+    s.evolves = utils.getEvolvesCount(s)
+  })
+
+  return {
+    success: true,
+    species: speciesList,
+    eggs: eggList
+  }
+}
+
+function sleep(time) {
+  return new Promise(r => setTimeout(r, time))
+}
+
+const getTrainerInfoSuccess = createAction('GET_TRAINER_INFO_SUCCESS')
+const getTrainerInfoFailed = createAction('GET_TRAINER_INFO_FAILED')
+
+const getTrainerPokemonSuccess = createAction('GET_TRAINER_POKEMON_SUCCESS')
+const getTrainerPokemonFailed = createAction('GET_TRAINER_POKEMON_FAILED')
+
+const toggleFavoritePokemonSuccess = createAction('TOGGLE_FAVORITE_POKEMON_SUCCESS')
+const toggleFavoritePokemonFailed = createAction('TOGGLE_FAVORITE_POKEMON_FAILED')
+
+const powerUpPokemonSuccess = createAction('POWER_UP_POKEMON_SUCCESS')
+const powerUpPokemonFailed = createAction('POWER_UP_POKEMON_FAILED')
+
+const renamePokemonSuccess = createAction('RENAME_POKEMON_SUCCESS')
+const renamePokemonFailed = createAction('RENAME_POKEMON_FAILED')
+
+const transferPokemonSuccess = createAction('TRANSFER_POKEMON_SUCCESS')
+const transferPokemonFailed = createAction('TRANSFER_POKEMON_FAILED')
+
+const evolvePokemonSuccess = createAction('EVOLVE_POKEMON_SUCCESS')
+const evolvePokemonFailed = createAction('EVOLVE_POKEMON_FAILED')
+
+function getTrainerInfo() {
+  return async (dispatch) => {
+    try {
+      const response = await client.getPlayer()
+
+      if (!response.success) {
+        dispatch(getTrainerInfoFailed('Failed in retrieving player info.  Please restart.'))
+        return
+      }
+      dispatch(getTrainerInfoSuccess({
+        trainerData: response.player_data
+      }))
+    } catch (error) {
+      dispatch(getTrainerInfoFailed(error))
+    }
+  }
+}
+
+function getTrainerPokemon() {
+  return async (dispatch) => {
+    try {
+      const inventory = await client.getInventory(0)
+
+      if (!inventory.success) {
+        dispatch(getTrainerPokemonFailed('Failed to retrieve Trainers Pokemon'))
+        return
+      }
+
+      const payload = parseInventory(inventory)
+
+      dispatch(getTrainerPokemonSuccess(payload))
+    } catch (error) {
+      dispatch(getTrainerPokemonFailed(error))
+    }
+  }
+}
+
+function powerUpPokemon(pokemon) {
+  return async (dispatch) => {
+    try {
+      await client.upgradePokemon(pokemon.id)
+
+      // TODO parse the response instead of retrieving all the new pokemon
+      // Requires replacing the main parsing with more functional code
+      await dispatch(getTrainerPokemon())
+      dispatch(powerUpPokemonSuccess(pokemon))
+    } catch (error) {
+      dispatch(powerUpPokemonFailed(error))
+    }
+  }
+}
+
+function toggleFavoritePokemon(pokemon) {
+  return async (dispatch) => {
+    try {
+      // TODO Stop this -1 0 shit
+      const updatedPokemon = Object.assign({}, pokemon, {
+        favorite: !pokemon.favorite ? -1 : -0
+      })
+
+      await client.setFavoritePokemon(pokemon.id, !!updatedPokemon.favorite)
+      dispatch(toggleFavoritePokemonSuccess(updatedPokemon))
+    } catch (error) {
+      dispatch(toggleFavoritePokemonFailed(error))
+    }
+  }
+}
+
+function renamePokemon(pokemon, nickname, callback) {
+  const updatedPokemon = Object.assign({}, pokemon, { nickname })
+
+  return async (dispatch) => {
+    try {
+      await client.nicknamePokemon(updatedPokemon.id, updatedPokemon.nickname)
+
+      dispatch(renamePokemonSuccess(updatedPokemon))
+
+      // modals are outside of the lifecycle of the table
+      // so we must inform it manually
+      // this would be fixed if we were using react modals
+      callback(updatedPokemon)
+    } catch (error) {
+      dispatch(renamePokemonFailed(error))
+    }
+  }
+}
+
+function transferPokemon(pokemon, delay) {
+  return async (dispatch) => {
+    try {
+      await sleep(delay)
+      await client.releasePokemon(pokemon.id)
+      dispatch(transferPokemonSuccess(pokemon))
+    } catch (error) {
+      dispatch(transferPokemonFailed(error))
+    }
+  }
+}
+
+function evolvePokemon(pokemon, delay) {
+  return async (dispatch) => {
+    try {
+      await sleep(delay)
+      await client.evolvePokemon(pokemon.id)
+      dispatch(evolvePokemonSuccess(pokemon))
+    } catch (error) {
+      dispatch(evolvePokemonFailed(error))
+    }
+  }
+}
+
+export default {
+  updateMonster: createAction('UPDATE_MONSTER'),
+  updateSpecies: createAction('UPDATE_SPECIES'),
+  updateMonsterSort: createAction('UPDATE_MONSTER_SORT'),
+  sortSpecies: createAction('SORT_SPECIES'),
+  checkPokemon: createAction('CHECK_POKEMON'),
+  checkAllBySpecies: createAction('CHECK_ALL_BY_SPECIES'),
+  collapseBySpecies: createAction('COLLAPSE_BY_SPECIES'),
+  sortAllSpecies: createAction('SORT_ALL_SPECIES'),
+  sortWithDefaults: createAction('SORT_WITH_DEFAULTS'),
+  getTrainerInfo,
+  getTrainerPokemon,
+  powerUpPokemon,
+  toggleFavoritePokemon,
+  renamePokemon,
+  transferPokemon,
+  evolvePokemon,
+}
diff --git a/app/client.js b/app/client.js
new file mode 100644
index 0000000..7742893
--- /dev/null
+++ b/app/client.js
@@ -0,0 +1,3 @@
+import pogobuf from 'pogobuf'
+
+export default new pogobuf.Client()
diff --git a/app/css/pokenurse.css b/app/css/pokenurse.css
index d65b532..a771809 100644
--- a/app/css/pokenurse.css
+++ b/app/css/pokenurse.css
@@ -5,7 +5,7 @@
   width: 14px;
   height: 14px;
   left: 15px;
-  top: 17px;
+  top: 19px;
 }
 
 /* Color/shape of burger icon bars */
@@ -48,6 +48,7 @@
 
 .bm-menu .bm-item-list li a {
   padding: 5px 0px;
+  cursor: pointer;
 }
 
 .bm-menu .bm-item-list i {
@@ -55,40 +56,6 @@
   float: right;
 }
 
-.switch {
-    border: 1px solid #ccc;
-    width: 50px;
-    height: 26px;
-    border-radius: 13px;
-    cursor: pointer;
-    display: inline-block;
-    float: right;
-}
-
-.switch-toggle {
-    border: 1px solid #999;
-    box-shadow: 1px 1px 1px #ccc;
-    width: 25px;
-    height: 24px;
-    left: 0;
-    border-radius: 12px;
-    background: white;
-    position: relative;
-    transition: left .2s ease-in-out;
-}
-
-.switch.on {
-    background: green;
-}
-
-.switch.on .switch-toggle {
-    left: 23px;
-}
-
-.switch.disabled {
-    cursor: not-allowed;
-}
-
 /* Morph shape necessary with bubble or elastic */
 .bm-morph-shape {
   fill: #373a47;
@@ -129,8 +96,8 @@
 }
 
 .username {
-  padding-top: 15px;
-  margin-left: 15px;
+  padding-top: 17px;
+  margin-left: 40px;
   color: white;
 }
 
@@ -608,7 +575,7 @@ fontSize: 18px;
 font-weight: bold;
 }
 
-.modal-outline-white{
+#detailModal .modal-outline-white{
 text-shadow:
     1px 2px 0 #000,
    -1px -1px 0 #000,
@@ -617,7 +584,7 @@ text-shadow:
     1px  1px 0 #000;
 -webkit-text-fill-color: white;
 }
-.modal-header{
+#detailModal .modal-header{
 border-bottom: 0px solid;
 }
 
@@ -925,6 +892,79 @@ table tbody tr.child:hover {
 }
 
 /*Input Styles*/
+
+input#toggle {
+  display: block;
+  position: relative;
+  /* box-shadow: inset 0 0 0px 1px #d5d5d5; */
+  border-width: 1.5px;
+  border-style: solid;
+  border-color: #d5d5d5;
+  box-sizing: border-box;
+  text-indent: -5000px;
+  height: 31px;
+  width: 51px;
+  border-radius: 15.5px;
+  -webkit-appearance: none;
+}
+
+input#toggle:checked {
+  border-color: rgba(76,217,100,1);
+  -webkit-transition: .25s cubic-bezier(0.77, 0, 0.175, 1);
+}
+
+/* background OFF */
+
+input#toggle:before {
+  content: "";
+  position: absolute;
+  display: block;
+  height: 29px;
+  width: 28px;
+  border-radius: 14px;
+  top: 0px;
+  left: 0px;
+  background: rgba(19,191,17,0);
+  box-sizing: border-box;
+  -webkit-transition: .25s cubic-bezier(0.77, 0, 0.175, 1);
+}
+
+/* button OFF */
+
+input#toggle:after {
+  content: "";
+  position: absolute;
+  display: block;
+  height: 28px;
+  width: 28px;
+  top: 0px;
+  left: 0px;
+  border-radius: 14px;
+  background: white;
+  box-shadow: 0 0px 1px rgba(0,0,0,.4), 0 4px 2px rgba(0,0,0,.1);
+  -webkit-transition: .2s cubic-bezier(0.77, 0, 0.175, 1);
+}
+
+/* background ON */
+
+input#toggle:checked:before {
+  width: 48px;
+  background: rgb(76,217,100); /* Old browsers */
+  background: -moz-linear-gradient(top,  rgba(76,217,100,1) 0%, rgba(73,211,97,1) 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(76,217,100,1)), color-stop(100%,rgba(73,211,97,1))); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top,  rgba(76,217,100,1) 0%,rgba(73,211,97,1) 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top,  rgba(76,217,100,1) 0%,rgba(73,211,97,1) 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top,  rgba(76,217,100,1) 0%,rgba(73,211,97,1) 100%); /* IE10+ */
+  background: linear-gradient(to bottom,  rgba(76,217,100,1) 0%,rgba(73,211,97,1) 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4cd964', endColorstr='#49d361',GradientType=0 ); /* IE6-9 */
+}
+
+/* button ON */
+
+input#toggle:checked:after {
+  left: 20.25px;
+}
+
 textarea:focus,
 input[type="text"]:focus,
 input[type="password"]:focus,
@@ -940,6 +980,7 @@ input[type="url"]:focus,
 input[type="search"]:focus,
 input[type="tel"]:focus,
 input[type="color"]:focus,
+input#toggle,
 .btn:focus,
 .btn:active:focus {
   border-color: rgba(0, 0, 0, 0.2);
diff --git a/app/imgs/3d/bulbasaur.jpg b/app/imgs/3d/1.png
similarity index 100%
rename from app/imgs/3d/bulbasaur.jpg
rename to app/imgs/3d/1.png
diff --git a/app/imgs/3d/caterpie.jpg b/app/imgs/3d/10.png
similarity index 100%
rename from app/imgs/3d/caterpie.jpg
rename to app/imgs/3d/10.png
diff --git a/app/imgs/3d/voltorb.jpg b/app/imgs/3d/100.png
similarity index 100%
rename from app/imgs/3d/voltorb.jpg
rename to app/imgs/3d/100.png
diff --git a/app/imgs/3d/electrode.jpg b/app/imgs/3d/101.png
similarity index 100%
rename from app/imgs/3d/electrode.jpg
rename to app/imgs/3d/101.png
diff --git a/app/imgs/3d/exeggcute.jpg b/app/imgs/3d/102.png
similarity index 100%
rename from app/imgs/3d/exeggcute.jpg
rename to app/imgs/3d/102.png
diff --git a/app/imgs/3d/exeggutor.jpg b/app/imgs/3d/103.png
similarity index 100%
rename from app/imgs/3d/exeggutor.jpg
rename to app/imgs/3d/103.png
diff --git a/app/imgs/3d/cubone.jpg b/app/imgs/3d/104.png
similarity index 100%
rename from app/imgs/3d/cubone.jpg
rename to app/imgs/3d/104.png
diff --git a/app/imgs/3d/marowak.jpg b/app/imgs/3d/105.png
similarity index 100%
rename from app/imgs/3d/marowak.jpg
rename to app/imgs/3d/105.png
diff --git a/app/imgs/3d/hitmonlee.jpg b/app/imgs/3d/106.png
similarity index 100%
rename from app/imgs/3d/hitmonlee.jpg
rename to app/imgs/3d/106.png
diff --git a/app/imgs/3d/hitmonchan.jpg b/app/imgs/3d/107.png
similarity index 100%
rename from app/imgs/3d/hitmonchan.jpg
rename to app/imgs/3d/107.png
diff --git a/app/imgs/3d/lickitung.jpg b/app/imgs/3d/108.png
similarity index 100%
rename from app/imgs/3d/lickitung.jpg
rename to app/imgs/3d/108.png
diff --git a/app/imgs/3d/koffing.jpg b/app/imgs/3d/109.png
similarity index 100%
rename from app/imgs/3d/koffing.jpg
rename to app/imgs/3d/109.png
diff --git a/app/imgs/3d/metapod.jpg b/app/imgs/3d/11.png
similarity index 100%
rename from app/imgs/3d/metapod.jpg
rename to app/imgs/3d/11.png
diff --git a/app/imgs/3d/weezing.jpg b/app/imgs/3d/110.png
similarity index 100%
rename from app/imgs/3d/weezing.jpg
rename to app/imgs/3d/110.png
diff --git a/app/imgs/3d/rhyhorn.jpg b/app/imgs/3d/111.png
similarity index 100%
rename from app/imgs/3d/rhyhorn.jpg
rename to app/imgs/3d/111.png
diff --git a/app/imgs/3d/rhydon.jpg b/app/imgs/3d/112.png
similarity index 100%
rename from app/imgs/3d/rhydon.jpg
rename to app/imgs/3d/112.png
diff --git a/app/imgs/3d/chansey.jpg b/app/imgs/3d/113.png
similarity index 100%
rename from app/imgs/3d/chansey.jpg
rename to app/imgs/3d/113.png
diff --git a/app/imgs/3d/114.png b/app/imgs/3d/114.png
new file mode 100644
index 0000000..a902488
Binary files /dev/null and b/app/imgs/3d/114.png differ
diff --git a/app/imgs/3d/kangaskhan.jpg b/app/imgs/3d/115.png
similarity index 100%
rename from app/imgs/3d/kangaskhan.jpg
rename to app/imgs/3d/115.png
diff --git a/app/imgs/3d/horsea.jpg b/app/imgs/3d/116.png
similarity index 100%
rename from app/imgs/3d/horsea.jpg
rename to app/imgs/3d/116.png
diff --git a/app/imgs/3d/seadra.jpg b/app/imgs/3d/117.png
similarity index 100%
rename from app/imgs/3d/seadra.jpg
rename to app/imgs/3d/117.png
diff --git a/app/imgs/3d/goldeen.jpg b/app/imgs/3d/118.png
similarity index 100%
rename from app/imgs/3d/goldeen.jpg
rename to app/imgs/3d/118.png
diff --git a/app/imgs/3d/seaking.jpg b/app/imgs/3d/119.png
similarity index 100%
rename from app/imgs/3d/seaking.jpg
rename to app/imgs/3d/119.png
diff --git a/app/imgs/3d/butterfree.jpg b/app/imgs/3d/12.png
similarity index 100%
rename from app/imgs/3d/butterfree.jpg
rename to app/imgs/3d/12.png
diff --git a/app/imgs/3d/staryu.jpg b/app/imgs/3d/120.png
similarity index 100%
rename from app/imgs/3d/staryu.jpg
rename to app/imgs/3d/120.png
diff --git a/app/imgs/3d/starmie.jpg b/app/imgs/3d/121.png
similarity index 100%
rename from app/imgs/3d/starmie.jpg
rename to app/imgs/3d/121.png
diff --git a/app/imgs/3d/122.png b/app/imgs/3d/122.png
new file mode 100644
index 0000000..1ac65fc
Binary files /dev/null and b/app/imgs/3d/122.png differ
diff --git a/app/imgs/3d/scyther.jpg b/app/imgs/3d/123.png
similarity index 100%
rename from app/imgs/3d/scyther.jpg
rename to app/imgs/3d/123.png
diff --git a/app/imgs/3d/jynx.jpg b/app/imgs/3d/124.png
similarity index 100%
rename from app/imgs/3d/jynx.jpg
rename to app/imgs/3d/124.png
diff --git a/app/imgs/3d/electabuzz.jpg b/app/imgs/3d/125.png
similarity index 100%
rename from app/imgs/3d/electabuzz.jpg
rename to app/imgs/3d/125.png
diff --git a/app/imgs/3d/magmar.jpg b/app/imgs/3d/126.png
similarity index 100%
rename from app/imgs/3d/magmar.jpg
rename to app/imgs/3d/126.png
diff --git a/app/imgs/3d/pinsir.jpg b/app/imgs/3d/127.png
similarity index 100%
rename from app/imgs/3d/pinsir.jpg
rename to app/imgs/3d/127.png
diff --git a/app/imgs/3d/tauros.jpg b/app/imgs/3d/128.png
similarity index 100%
rename from app/imgs/3d/tauros.jpg
rename to app/imgs/3d/128.png
diff --git a/app/imgs/3d/magikarp.jpg b/app/imgs/3d/129.png
similarity index 100%
rename from app/imgs/3d/magikarp.jpg
rename to app/imgs/3d/129.png
diff --git a/app/imgs/3d/weedle.jpg b/app/imgs/3d/13.png
similarity index 100%
rename from app/imgs/3d/weedle.jpg
rename to app/imgs/3d/13.png
diff --git a/app/imgs/3d/gyarados.jpg b/app/imgs/3d/130.png
similarity index 100%
rename from app/imgs/3d/gyarados.jpg
rename to app/imgs/3d/130.png
diff --git a/app/imgs/3d/lapras.jpg b/app/imgs/3d/131.png
similarity index 100%
rename from app/imgs/3d/lapras.jpg
rename to app/imgs/3d/131.png
diff --git a/app/imgs/3d/ditto.jpg b/app/imgs/3d/132.png
similarity index 100%
rename from app/imgs/3d/ditto.jpg
rename to app/imgs/3d/132.png
diff --git a/app/imgs/3d/eevee.jpg b/app/imgs/3d/133.png
similarity index 100%
rename from app/imgs/3d/eevee.jpg
rename to app/imgs/3d/133.png
diff --git a/app/imgs/3d/vaporeon.jpg b/app/imgs/3d/134.png
similarity index 100%
rename from app/imgs/3d/vaporeon.jpg
rename to app/imgs/3d/134.png
diff --git a/app/imgs/3d/jolteon.jpg b/app/imgs/3d/135.png
similarity index 100%
rename from app/imgs/3d/jolteon.jpg
rename to app/imgs/3d/135.png
diff --git a/app/imgs/3d/flareon.jpg b/app/imgs/3d/136.png
similarity index 100%
rename from app/imgs/3d/flareon.jpg
rename to app/imgs/3d/136.png
diff --git a/app/imgs/3d/porygon.jpg b/app/imgs/3d/137.png
similarity index 100%
rename from app/imgs/3d/porygon.jpg
rename to app/imgs/3d/137.png
diff --git a/app/imgs/3d/omanyte.jpg b/app/imgs/3d/138.png
similarity index 100%
rename from app/imgs/3d/omanyte.jpg
rename to app/imgs/3d/138.png
diff --git a/app/imgs/3d/omastar.jpg b/app/imgs/3d/139.png
similarity index 100%
rename from app/imgs/3d/omastar.jpg
rename to app/imgs/3d/139.png
diff --git a/app/imgs/3d/kakuna.jpg b/app/imgs/3d/14.png
similarity index 100%
rename from app/imgs/3d/kakuna.jpg
rename to app/imgs/3d/14.png
diff --git a/app/imgs/3d/kabuto.jpg b/app/imgs/3d/140.png
similarity index 100%
rename from app/imgs/3d/kabuto.jpg
rename to app/imgs/3d/140.png
diff --git a/app/imgs/3d/kabutops.jpg b/app/imgs/3d/141.png
similarity index 100%
rename from app/imgs/3d/kabutops.jpg
rename to app/imgs/3d/141.png
diff --git a/app/imgs/3d/aerodactyl.jpg b/app/imgs/3d/142.png
similarity index 100%
rename from app/imgs/3d/aerodactyl.jpg
rename to app/imgs/3d/142.png
diff --git a/app/imgs/3d/snorlax.jpg b/app/imgs/3d/143.png
similarity index 100%
rename from app/imgs/3d/snorlax.jpg
rename to app/imgs/3d/143.png
diff --git a/app/imgs/3d/articuno.jpg b/app/imgs/3d/144.png
similarity index 100%
rename from app/imgs/3d/articuno.jpg
rename to app/imgs/3d/144.png
diff --git a/app/imgs/3d/zapdos.jpg b/app/imgs/3d/145.png
similarity index 100%
rename from app/imgs/3d/zapdos.jpg
rename to app/imgs/3d/145.png
diff --git a/app/imgs/3d/moltres.jpg b/app/imgs/3d/146.png
similarity index 100%
rename from app/imgs/3d/moltres.jpg
rename to app/imgs/3d/146.png
diff --git a/app/imgs/3d/dratini.jpg b/app/imgs/3d/147.png
similarity index 100%
rename from app/imgs/3d/dratini.jpg
rename to app/imgs/3d/147.png
diff --git a/app/imgs/3d/dragonair.jpg b/app/imgs/3d/148.png
similarity index 100%
rename from app/imgs/3d/dragonair.jpg
rename to app/imgs/3d/148.png
diff --git a/app/imgs/3d/dragonite.jpg b/app/imgs/3d/149.png
similarity index 100%
rename from app/imgs/3d/dragonite.jpg
rename to app/imgs/3d/149.png
diff --git a/app/imgs/3d/beedrill.jpg b/app/imgs/3d/15.png
similarity index 100%
rename from app/imgs/3d/beedrill.jpg
rename to app/imgs/3d/15.png
diff --git a/app/imgs/3d/mewtwo.jpg b/app/imgs/3d/150.png
similarity index 100%
rename from app/imgs/3d/mewtwo.jpg
rename to app/imgs/3d/150.png
diff --git a/app/imgs/3d/mew.jpg b/app/imgs/3d/151.png
similarity index 100%
rename from app/imgs/3d/mew.jpg
rename to app/imgs/3d/151.png
diff --git a/app/imgs/3d/pidgey.jpg b/app/imgs/3d/16.png
similarity index 100%
rename from app/imgs/3d/pidgey.jpg
rename to app/imgs/3d/16.png
diff --git a/app/imgs/3d/pidgeotto.jpg b/app/imgs/3d/17.png
similarity index 100%
rename from app/imgs/3d/pidgeotto.jpg
rename to app/imgs/3d/17.png
diff --git a/app/imgs/3d/pidgeot.jpg b/app/imgs/3d/18.png
similarity index 100%
rename from app/imgs/3d/pidgeot.jpg
rename to app/imgs/3d/18.png
diff --git a/app/imgs/3d/rattata.jpg b/app/imgs/3d/19.png
similarity index 100%
rename from app/imgs/3d/rattata.jpg
rename to app/imgs/3d/19.png
diff --git a/app/imgs/3d/ivysaur.jpg b/app/imgs/3d/2.png
similarity index 100%
rename from app/imgs/3d/ivysaur.jpg
rename to app/imgs/3d/2.png
diff --git a/app/imgs/3d/raticate.jpg b/app/imgs/3d/20.png
similarity index 100%
rename from app/imgs/3d/raticate.jpg
rename to app/imgs/3d/20.png
diff --git a/app/imgs/3d/spearow.jpg b/app/imgs/3d/21.png
similarity index 100%
rename from app/imgs/3d/spearow.jpg
rename to app/imgs/3d/21.png
diff --git a/app/imgs/3d/fearow.jpg b/app/imgs/3d/22.png
similarity index 100%
rename from app/imgs/3d/fearow.jpg
rename to app/imgs/3d/22.png
diff --git a/app/imgs/3d/ekans.jpg b/app/imgs/3d/23.png
similarity index 100%
rename from app/imgs/3d/ekans.jpg
rename to app/imgs/3d/23.png
diff --git a/app/imgs/3d/arbok.jpg b/app/imgs/3d/24.png
similarity index 100%
rename from app/imgs/3d/arbok.jpg
rename to app/imgs/3d/24.png
diff --git a/app/imgs/3d/pikachu.jpg b/app/imgs/3d/25.png
similarity index 100%
rename from app/imgs/3d/pikachu.jpg
rename to app/imgs/3d/25.png
diff --git a/app/imgs/3d/raichu.jpg b/app/imgs/3d/26.png
similarity index 100%
rename from app/imgs/3d/raichu.jpg
rename to app/imgs/3d/26.png
diff --git a/app/imgs/3d/sandshrew.jpg b/app/imgs/3d/27.png
similarity index 100%
rename from app/imgs/3d/sandshrew.jpg
rename to app/imgs/3d/27.png
diff --git a/app/imgs/3d/sandslash.jpg b/app/imgs/3d/28.png
similarity index 100%
rename from app/imgs/3d/sandslash.jpg
rename to app/imgs/3d/28.png
diff --git a/app/imgs/3d/nidoran-f.jpg b/app/imgs/3d/29.png
similarity index 100%
rename from app/imgs/3d/nidoran-f.jpg
rename to app/imgs/3d/29.png
diff --git a/app/imgs/3d/venusaur.jpg b/app/imgs/3d/3.png
similarity index 100%
rename from app/imgs/3d/venusaur.jpg
rename to app/imgs/3d/3.png
diff --git a/app/imgs/3d/nidorina.jpg b/app/imgs/3d/30.png
similarity index 100%
rename from app/imgs/3d/nidorina.jpg
rename to app/imgs/3d/30.png
diff --git a/app/imgs/3d/nidoqueen.jpg b/app/imgs/3d/31.png
similarity index 100%
rename from app/imgs/3d/nidoqueen.jpg
rename to app/imgs/3d/31.png
diff --git a/app/imgs/3d/nidoran-m.jpg b/app/imgs/3d/32.png
similarity index 100%
rename from app/imgs/3d/nidoran-m.jpg
rename to app/imgs/3d/32.png
diff --git a/app/imgs/3d/nidorino.jpg b/app/imgs/3d/33.png
similarity index 100%
rename from app/imgs/3d/nidorino.jpg
rename to app/imgs/3d/33.png
diff --git a/app/imgs/3d/nidoking.jpg b/app/imgs/3d/34.png
similarity index 100%
rename from app/imgs/3d/nidoking.jpg
rename to app/imgs/3d/34.png
diff --git a/app/imgs/3d/clefairy.jpg b/app/imgs/3d/35.png
similarity index 100%
rename from app/imgs/3d/clefairy.jpg
rename to app/imgs/3d/35.png
diff --git a/app/imgs/3d/clefable.jpg b/app/imgs/3d/36.png
similarity index 100%
rename from app/imgs/3d/clefable.jpg
rename to app/imgs/3d/36.png
diff --git a/app/imgs/3d/vulpix.jpg b/app/imgs/3d/37.png
similarity index 100%
rename from app/imgs/3d/vulpix.jpg
rename to app/imgs/3d/37.png
diff --git a/app/imgs/3d/ninetales.jpg b/app/imgs/3d/38.png
similarity index 100%
rename from app/imgs/3d/ninetales.jpg
rename to app/imgs/3d/38.png
diff --git a/app/imgs/3d/jigglypuff.jpg b/app/imgs/3d/39.png
similarity index 100%
rename from app/imgs/3d/jigglypuff.jpg
rename to app/imgs/3d/39.png
diff --git a/app/imgs/3d/charmander.jpg b/app/imgs/3d/4.png
similarity index 100%
rename from app/imgs/3d/charmander.jpg
rename to app/imgs/3d/4.png
diff --git a/app/imgs/3d/wigglytuff.jpg b/app/imgs/3d/40.png
similarity index 100%
rename from app/imgs/3d/wigglytuff.jpg
rename to app/imgs/3d/40.png
diff --git a/app/imgs/3d/zubat.jpg b/app/imgs/3d/41.png
similarity index 100%
rename from app/imgs/3d/zubat.jpg
rename to app/imgs/3d/41.png
diff --git a/app/imgs/3d/golbat.jpg b/app/imgs/3d/42.png
similarity index 100%
rename from app/imgs/3d/golbat.jpg
rename to app/imgs/3d/42.png
diff --git a/app/imgs/3d/oddish.jpg b/app/imgs/3d/43.png
similarity index 100%
rename from app/imgs/3d/oddish.jpg
rename to app/imgs/3d/43.png
diff --git a/app/imgs/3d/gloom.jpg b/app/imgs/3d/44.png
similarity index 100%
rename from app/imgs/3d/gloom.jpg
rename to app/imgs/3d/44.png
diff --git a/app/imgs/3d/vileplume.jpg b/app/imgs/3d/45.png
similarity index 100%
rename from app/imgs/3d/vileplume.jpg
rename to app/imgs/3d/45.png
diff --git a/app/imgs/3d/paras.jpg b/app/imgs/3d/46.png
similarity index 100%
rename from app/imgs/3d/paras.jpg
rename to app/imgs/3d/46.png
diff --git a/app/imgs/3d/parasect.jpg b/app/imgs/3d/47.png
similarity index 100%
rename from app/imgs/3d/parasect.jpg
rename to app/imgs/3d/47.png
diff --git a/app/imgs/3d/venonat.jpg b/app/imgs/3d/48.png
similarity index 100%
rename from app/imgs/3d/venonat.jpg
rename to app/imgs/3d/48.png
diff --git a/app/imgs/3d/venomoth.jpg b/app/imgs/3d/49.png
similarity index 100%
rename from app/imgs/3d/venomoth.jpg
rename to app/imgs/3d/49.png
diff --git a/app/imgs/3d/charmeleon.jpg b/app/imgs/3d/5.png
similarity index 100%
rename from app/imgs/3d/charmeleon.jpg
rename to app/imgs/3d/5.png
diff --git a/app/imgs/3d/diglett.jpg b/app/imgs/3d/50.png
similarity index 100%
rename from app/imgs/3d/diglett.jpg
rename to app/imgs/3d/50.png
diff --git a/app/imgs/3d/dugtrio.jpg b/app/imgs/3d/51.png
similarity index 100%
rename from app/imgs/3d/dugtrio.jpg
rename to app/imgs/3d/51.png
diff --git a/app/imgs/3d/meowth.jpg b/app/imgs/3d/52.png
similarity index 100%
rename from app/imgs/3d/meowth.jpg
rename to app/imgs/3d/52.png
diff --git a/app/imgs/3d/persian.jpg b/app/imgs/3d/53.png
similarity index 100%
rename from app/imgs/3d/persian.jpg
rename to app/imgs/3d/53.png
diff --git a/app/imgs/3d/psyduck.jpg b/app/imgs/3d/54.png
similarity index 100%
rename from app/imgs/3d/psyduck.jpg
rename to app/imgs/3d/54.png
diff --git a/app/imgs/3d/golduck.jpg b/app/imgs/3d/55.png
similarity index 100%
rename from app/imgs/3d/golduck.jpg
rename to app/imgs/3d/55.png
diff --git a/app/imgs/3d/mankey.jpg b/app/imgs/3d/56.png
similarity index 100%
rename from app/imgs/3d/mankey.jpg
rename to app/imgs/3d/56.png
diff --git a/app/imgs/3d/primeape.jpg b/app/imgs/3d/57.png
similarity index 100%
rename from app/imgs/3d/primeape.jpg
rename to app/imgs/3d/57.png
diff --git a/app/imgs/3d/growlithe.jpg b/app/imgs/3d/58.png
similarity index 100%
rename from app/imgs/3d/growlithe.jpg
rename to app/imgs/3d/58.png
diff --git a/app/imgs/3d/arcanine.jpg b/app/imgs/3d/59.png
similarity index 100%
rename from app/imgs/3d/arcanine.jpg
rename to app/imgs/3d/59.png
diff --git a/app/imgs/3d/charizard.jpg b/app/imgs/3d/6.png
similarity index 100%
rename from app/imgs/3d/charizard.jpg
rename to app/imgs/3d/6.png
diff --git a/app/imgs/3d/poliwag.jpg b/app/imgs/3d/60.png
similarity index 100%
rename from app/imgs/3d/poliwag.jpg
rename to app/imgs/3d/60.png
diff --git a/app/imgs/3d/poliwhirl.jpg b/app/imgs/3d/61.png
similarity index 100%
rename from app/imgs/3d/poliwhirl.jpg
rename to app/imgs/3d/61.png
diff --git a/app/imgs/3d/poliwrath.jpg b/app/imgs/3d/62.png
similarity index 100%
rename from app/imgs/3d/poliwrath.jpg
rename to app/imgs/3d/62.png
diff --git a/app/imgs/3d/abra.jpg b/app/imgs/3d/63.png
similarity index 100%
rename from app/imgs/3d/abra.jpg
rename to app/imgs/3d/63.png
diff --git a/app/imgs/3d/kadabra.jpg b/app/imgs/3d/64.png
similarity index 100%
rename from app/imgs/3d/kadabra.jpg
rename to app/imgs/3d/64.png
diff --git a/app/imgs/3d/alakazam.jpg b/app/imgs/3d/65.png
similarity index 100%
rename from app/imgs/3d/alakazam.jpg
rename to app/imgs/3d/65.png
diff --git a/app/imgs/3d/machop.jpg b/app/imgs/3d/66.png
similarity index 100%
rename from app/imgs/3d/machop.jpg
rename to app/imgs/3d/66.png
diff --git a/app/imgs/3d/machoke.jpg b/app/imgs/3d/67.png
similarity index 100%
rename from app/imgs/3d/machoke.jpg
rename to app/imgs/3d/67.png
diff --git a/app/imgs/3d/machamp.jpg b/app/imgs/3d/68.png
similarity index 100%
rename from app/imgs/3d/machamp.jpg
rename to app/imgs/3d/68.png
diff --git a/app/imgs/3d/bellsprout.jpg b/app/imgs/3d/69.png
similarity index 100%
rename from app/imgs/3d/bellsprout.jpg
rename to app/imgs/3d/69.png
diff --git a/app/imgs/3d/squirtle.jpg b/app/imgs/3d/7.png
similarity index 100%
rename from app/imgs/3d/squirtle.jpg
rename to app/imgs/3d/7.png
diff --git a/app/imgs/3d/weepinbell.jpg b/app/imgs/3d/70.png
similarity index 100%
rename from app/imgs/3d/weepinbell.jpg
rename to app/imgs/3d/70.png
diff --git a/app/imgs/3d/victreebel.jpg b/app/imgs/3d/71.png
similarity index 100%
rename from app/imgs/3d/victreebel.jpg
rename to app/imgs/3d/71.png
diff --git a/app/imgs/3d/tentacool.jpg b/app/imgs/3d/72.png
similarity index 100%
rename from app/imgs/3d/tentacool.jpg
rename to app/imgs/3d/72.png
diff --git a/app/imgs/3d/tentacruel.jpg b/app/imgs/3d/73.png
similarity index 100%
rename from app/imgs/3d/tentacruel.jpg
rename to app/imgs/3d/73.png
diff --git a/app/imgs/3d/geodude.jpg b/app/imgs/3d/74.png
similarity index 100%
rename from app/imgs/3d/geodude.jpg
rename to app/imgs/3d/74.png
diff --git a/app/imgs/3d/graveler.jpg b/app/imgs/3d/75.png
similarity index 100%
rename from app/imgs/3d/graveler.jpg
rename to app/imgs/3d/75.png
diff --git a/app/imgs/3d/golem.jpg b/app/imgs/3d/76.png
similarity index 100%
rename from app/imgs/3d/golem.jpg
rename to app/imgs/3d/76.png
diff --git a/app/imgs/3d/ponyta.jpg b/app/imgs/3d/77.png
similarity index 100%
rename from app/imgs/3d/ponyta.jpg
rename to app/imgs/3d/77.png
diff --git a/app/imgs/3d/rapidash.jpg b/app/imgs/3d/78.png
similarity index 100%
rename from app/imgs/3d/rapidash.jpg
rename to app/imgs/3d/78.png
diff --git a/app/imgs/3d/slowpoke.jpg b/app/imgs/3d/79.png
similarity index 100%
rename from app/imgs/3d/slowpoke.jpg
rename to app/imgs/3d/79.png
diff --git a/app/imgs/3d/wartortle.jpg b/app/imgs/3d/8.png
similarity index 100%
rename from app/imgs/3d/wartortle.jpg
rename to app/imgs/3d/8.png
diff --git a/app/imgs/3d/slowbro.jpg b/app/imgs/3d/80.png
similarity index 100%
rename from app/imgs/3d/slowbro.jpg
rename to app/imgs/3d/80.png
diff --git a/app/imgs/3d/magnemite.jpg b/app/imgs/3d/81.png
similarity index 100%
rename from app/imgs/3d/magnemite.jpg
rename to app/imgs/3d/81.png
diff --git a/app/imgs/3d/magneton.jpg b/app/imgs/3d/82.png
similarity index 100%
rename from app/imgs/3d/magneton.jpg
rename to app/imgs/3d/82.png
diff --git a/app/imgs/3d/farfetchd.jpg b/app/imgs/3d/83.png
similarity index 100%
rename from app/imgs/3d/farfetchd.jpg
rename to app/imgs/3d/83.png
diff --git a/app/imgs/3d/doduo.jpg b/app/imgs/3d/84.png
similarity index 100%
rename from app/imgs/3d/doduo.jpg
rename to app/imgs/3d/84.png
diff --git a/app/imgs/3d/dodrio.jpg b/app/imgs/3d/85.png
similarity index 100%
rename from app/imgs/3d/dodrio.jpg
rename to app/imgs/3d/85.png
diff --git a/app/imgs/3d/seel.jpg b/app/imgs/3d/86.png
similarity index 100%
rename from app/imgs/3d/seel.jpg
rename to app/imgs/3d/86.png
diff --git a/app/imgs/3d/dewgong.jpg b/app/imgs/3d/87.png
similarity index 100%
rename from app/imgs/3d/dewgong.jpg
rename to app/imgs/3d/87.png
diff --git a/app/imgs/3d/grimer.jpg b/app/imgs/3d/88.png
similarity index 100%
rename from app/imgs/3d/grimer.jpg
rename to app/imgs/3d/88.png
diff --git a/app/imgs/3d/muk.jpg b/app/imgs/3d/89.png
similarity index 100%
rename from app/imgs/3d/muk.jpg
rename to app/imgs/3d/89.png
diff --git a/app/imgs/3d/blastoise.jpg b/app/imgs/3d/9.png
similarity index 100%
rename from app/imgs/3d/blastoise.jpg
rename to app/imgs/3d/9.png
diff --git a/app/imgs/3d/shellder.jpg b/app/imgs/3d/90.png
similarity index 100%
rename from app/imgs/3d/shellder.jpg
rename to app/imgs/3d/90.png
diff --git a/app/imgs/3d/cloyster.jpg b/app/imgs/3d/91.png
similarity index 100%
rename from app/imgs/3d/cloyster.jpg
rename to app/imgs/3d/91.png
diff --git a/app/imgs/3d/gastly.jpg b/app/imgs/3d/92.png
similarity index 100%
rename from app/imgs/3d/gastly.jpg
rename to app/imgs/3d/92.png
diff --git a/app/imgs/3d/haunter.jpg b/app/imgs/3d/93.png
similarity index 100%
rename from app/imgs/3d/haunter.jpg
rename to app/imgs/3d/93.png
diff --git a/app/imgs/3d/gengar.jpg b/app/imgs/3d/94.png
similarity index 100%
rename from app/imgs/3d/gengar.jpg
rename to app/imgs/3d/94.png
diff --git a/app/imgs/3d/onix.jpg b/app/imgs/3d/95.png
similarity index 100%
rename from app/imgs/3d/onix.jpg
rename to app/imgs/3d/95.png
diff --git a/app/imgs/3d/drowzee.jpg b/app/imgs/3d/96.png
similarity index 100%
rename from app/imgs/3d/drowzee.jpg
rename to app/imgs/3d/96.png
diff --git a/app/imgs/3d/hypno.jpg b/app/imgs/3d/97.png
similarity index 100%
rename from app/imgs/3d/hypno.jpg
rename to app/imgs/3d/97.png
diff --git a/app/imgs/3d/krabby.jpg b/app/imgs/3d/98.png
similarity index 100%
rename from app/imgs/3d/krabby.jpg
rename to app/imgs/3d/98.png
diff --git a/app/imgs/3d/kingler.jpg b/app/imgs/3d/99.png
similarity index 100%
rename from app/imgs/3d/kingler.jpg
rename to app/imgs/3d/99.png
diff --git a/app/imgs/3d/mime.jpg b/app/imgs/3d/mime.jpg
deleted file mode 100644
index 8537307..0000000
--- a/app/imgs/3d/mime.jpg
+++ /dev/null
@@ -1 +0,0 @@
-Not Found
\ No newline at end of file
diff --git a/app/imgs/3d/tangela.jpg b/app/imgs/3d/tangela.jpg
deleted file mode 100644
index 8537307..0000000
--- a/app/imgs/3d/tangela.jpg
+++ /dev/null
@@ -1 +0,0 @@
-Not Found
\ No newline at end of file
diff --git a/app/index.js b/app/index.js
index eda25cc..8506a0a 100644
--- a/app/index.js
+++ b/app/index.js
@@ -1,32 +1,55 @@
-import React from 'react'
+import React, {
+  PropTypes
+} from 'react'
 import ReactDOM from 'react-dom'
-import { ipcRenderer } from 'electron'
 import {
-  Provider
+  Provider,
+  connect
 } from 'react-redux'
+import { bindActionCreators } from 'redux'
 
 import store from './store'
 import Login from './screens/Login'
 import Table from './screens/Table'
 
+import {
+  login
+} from './actions'
+
 require('./css/pokenurse.css')
 
 const App = React.createClass({
-  getInitialState() {
-    return { loggedIn: false }
+  propTypes: {
+    authenticate: PropTypes.object.isRequired,
+    autoLogin: PropTypes.bool.isRequired,
+    login: PropTypes.func.isRequired,
   },
 
   componentDidMount() {
-    ipcRenderer.on('pokemon-logged-in', () => {
-      this.setState({ loggedIn: true })
-    })
+    const {
+      autoLogin,
+      authenticate,
+    } = this.props
+
+    const { credentials } = authenticate
+
+    if (autoLogin && credentials.method && credentials.password && credentials.username) {
+      this.props.login(credentials)
+    }
   },
 
   render() {
-    if (this.state.loggedIn) return (<Table />)
+    if (this.props.authenticate.loggedIn) return (<Table />)
 
     return (<Login />)
   }
 })
 
-ReactDOM.render(<Provider store={store}><App /></Provider>, document.getElementById('content'))
+const ConnectedApp = connect((state => ({
+  authenticate: state.authenticate,
+  autoLogin: state.settings.autoLogin,
+})), (dispatch => bindActionCreators({
+  login
+}, dispatch)))(App)
+
+ReactDOM.render(<Provider store={store}><ConnectedApp /></Provider>, document.getElementById('content'))
diff --git a/app/reducers/authenticate.js b/app/reducers/authenticate.js
new file mode 100644
index 0000000..247dea7
--- /dev/null
+++ b/app/reducers/authenticate.js
@@ -0,0 +1,78 @@
+import fs from 'fs'
+import path from 'path'
+import {
+  handleActions
+} from 'redux-actions'
+import {
+  remote,
+  ipcRenderer
+} from 'electron'
+
+const accountPath = path.join(remote.app.getPath('appData'), '/pokenurse/account.json')
+
+const credentialsInitialState = {}
+
+// Helper to initialize the credentials state with existing account.json
+function getAccountCredentials() {
+  if (!fs.existsSync(accountPath)) {
+    return credentialsInitialState
+  }
+
+  // Maybe use readFile instead
+  const credentials = JSON.parse(fs.readFileSync(accountPath))
+
+  return {
+    method: credentials.method,
+    username: credentials.username,
+    password: credentials.password,
+  }
+}
+
+const initialState = {
+  loggedIn: false,
+  authenticating: false,
+  credentials: getAccountCredentials(),
+}
+
+export default handleActions({
+  USER_LOGIN_STARTED(state) {
+    return Object.assign({}, state, { authenticating: true })
+  },
+
+  USER_LOGIN_SUCCESS(state) {
+    return Object.assign({}, state, {
+      loggedIn: true,
+      authenticating: false,
+    })
+  },
+
+  USER_LOGIN_FAILED(state, action) {
+    ipcRenderer.send('error-message', String(action.payload.error))
+    return Object.assign({}, state, {
+      loggedIn: false,
+      authenticating: false,
+    })
+  },
+
+  USER_LOGOUT(state) {
+    return Object.assign({}, state, { loggedIn: false })
+  },
+
+  CHECK_AND_DELETE_CREDENTIALS_SUCCESS(state) {
+    return Object.assign({}, state, { credentials: credentialsInitialState })
+  },
+
+  CHECK_AND_DELETE_CREDENTIALS_FAILED(state) {
+    console.error('Failed to check and delete credentials.') // eslint-disable-line
+    return state
+  },
+
+  SAVE_ACCOUNT_CREDENTIALS_SUCCESS(state, action) {
+    return Object.assign({}, state, { credentials: action.payload.credentials })
+  },
+
+  SAVE_ACCOUNT_CREDENTIALS_FAILED(state) {
+    console.error('Failed to save account credentials.') // eslint-disable-line
+    return state
+  },
+}, initialState)
diff --git a/app/reducers/index.js b/app/reducers/index.js
index 172dcfd..12ee9c7 100644
--- a/app/reducers/index.js
+++ b/app/reducers/index.js
@@ -3,7 +3,24 @@ import {
 } from 'redux'
 
 import status from './status'
+import authenticate from './authenticate'
+import trainer from './trainer'
+import settings from './settings'
 
-export default combineReducers({
-  status
+const appReducer = combineReducers({
+  status,
+  authenticate,
+  trainer,
+  settings,
 })
+
+export default (state, action) => {
+  if (action.type === 'USER_LOGOUT') {
+    state = {
+      authenticate: state.authenticate,
+      settings: state.settings,
+    }
+  }
+
+  return appReducer(state, action)
+}
diff --git a/app/reducers/settings.js b/app/reducers/settings.js
new file mode 100644
index 0000000..592a4a1
--- /dev/null
+++ b/app/reducers/settings.js
@@ -0,0 +1,88 @@
+import path from 'path'
+import fs from 'fs'
+import {
+  handleActions
+} from 'redux-actions'
+import {
+  remote
+} from 'electron'
+
+const settingsPath = path.join(remote.app.getPath('appData'), '/pokenurse/settings.json')
+
+const ASCENDING = 'ASC'
+const DESCENDING = 'DESC'
+
+const initialSettingsState = {
+  showSpeciesWithZeroPokemon: true,
+  autoLogin: false,
+  defaultPokedexSortBy: 'pokemon_id',
+  defaultPokedexSortDirection: ASCENDING,
+  defaultSpecieSortBy: 'cp',
+  defaultSpecieSortDirection: DESCENDING,
+}
+
+function getInitialSettingsState() {
+  if (!fs.existsSync(settingsPath)) {
+    return initialSettingsState
+  }
+
+  const settingsJSON = JSON.parse(fs.readFileSync(settingsPath))
+
+  return Object.assign({}, initialSettingsState, settingsJSON)
+}
+
+function updateSettingState(state, setting) {
+  const updated = Object.assign({}, state, setting)
+
+  fs.writeFileSync(settingsPath, JSON.stringify(updated))
+
+  return updated
+}
+
+const defaultSettings = getInitialSettingsState()
+
+export {
+  defaultSettings,
+}
+
+export default handleActions({
+  TOGGLE_SHOW_SPECIES_WITH_ZERO_POKEMON(state) {
+    return updateSettingState(state, {
+      showSpeciesWithZeroPokemon: !state.showSpeciesWithZeroPokemon
+    })
+  },
+
+  TOGGLE_AUTO_LOGIN(state) {
+    return updateSettingState(state, {
+      autoLogin: !state.autoLogin
+    })
+  },
+
+  RESET_ALL_SETTINGS(state) {
+    return updateSettingState(state, initialSettingsState)
+  },
+
+  CHANGE_DEFAULT_POKEDEX_SORT_BY(state, action) {
+    return updateSettingState(state, {
+      defaultPokedexSortBy: action.payload
+    })
+  },
+
+  CHANGE_DEFAULT_POKEDEX_SORT_DIRECTION(state, action) {
+    return updateSettingState(state, {
+      defaultPokedexSortDirection: action.payload
+    })
+  },
+
+  CHANGE_DEFAULT_SPECIE_SORT_DIRECTION(state, action) {
+    return updateSettingState(state, {
+      defaultSpecieSortDirection: action.payload
+    })
+  },
+
+  CHANGE_DEFAULT_SPECIE_SORT_BY(state, action) {
+    return updateSettingState(state, {
+      defaultSpecieSortBy: action.payload
+    })
+  },
+}, defaultSettings)
diff --git a/app/reducers/trainer.js b/app/reducers/trainer.js
new file mode 100644
index 0000000..7cc40a7
--- /dev/null
+++ b/app/reducers/trainer.js
@@ -0,0 +1,469 @@
+import {
+  every,
+  mapValues,
+} from 'lodash'
+import {
+  handleActions
+} from 'redux-actions'
+import {
+  ipcRenderer,
+} from 'electron'
+
+import { Immutable, Organize } from '../utils'
+
+import {
+  defaultSettings
+} from './settings'
+
+const {
+  getSortedPokemon,
+  getSortedSpecies
+} = Organize
+
+const ASCENDING = 'ASC'
+const DESCENDING = 'DESC'
+
+const initialState = {
+  trainerData: null,
+  monsters: null,
+  filterBy: '',
+  sortBy: defaultSettings.defaultPokedexSortBy,
+  sortDir: defaultSettings.defaultPokedexSortDirection,
+  speciesState: null,
+  selectedCount: 0,
+}
+
+function getInitialPokemonState(specie) {
+  const pokemonState = {}
+  specie.pokemon.forEach((p) => {
+    pokemonState[p.id] = { check: false }
+  })
+  return pokemonState
+}
+
+function getNewSpeciesState(state) {
+  const speciesState = {}
+
+  const sortBy = defaultSettings.defaultSpecieSortBy
+  const sortDir = defaultSettings.defaultSpecieSortDirection
+
+  let selectedCount = 0
+
+  state.monsters.species.forEach((specie) => {
+    const pid = String(specie.pokemon_id)
+    let existingSpecieState = null
+
+    if (state.speciesState) existingSpecieState = state.speciesState[pid]
+
+    // specie state already exists
+    if (existingSpecieState) {
+      const updatedSpecieState = { pokemonState: {} }
+      let checkAll = true
+      specie.pokemon.forEach((p) => {
+        // pokemon already exists
+        if (existingSpecieState.pokemonState[p.id]) {
+          updatedSpecieState.pokemonState[p.id] = existingSpecieState.pokemonState[p.id]
+          const isChecked = updatedSpecieState.pokemonState[p.id].check
+          checkAll = checkAll && isChecked
+          if (isChecked) selectedCount++
+        // pokemon does not exist
+        } else {
+          updatedSpecieState.pokemonState[p.id] = { check: false }
+          checkAll = false
+        }
+      })
+      updatedSpecieState.checkAll = checkAll
+      speciesState[pid] = Object.assign({}, existingSpecieState, updatedSpecieState)
+    // specie state does not exist
+    } else {
+      speciesState[pid] = {
+        pokemonState: getInitialPokemonState(specie),
+        checkAll: false,
+        collapsed: true,
+        sortBy,
+        sortDir
+      }
+    }
+  })
+
+  return {
+    speciesState,
+    selectedCount
+  }
+}
+
+// TODO Utils
+function getNewMonsters(state, monsters, sortBy, sortDir) {
+  const sortedSpecies = getSortedSpecies(monsters, sortBy, sortDir)
+
+  // Mutates, but it is okay because we sliced/sorted above ^
+  sortedSpecies.forEach((specie) => {
+    // we don't have a specieState on start, sort will fallback to defaults
+    const specieState = state.speciesState ? state.speciesState[specie.pokemon_id] : null
+
+    specie.pokemon = getSortedPokemon(specie, specieState)
+  })
+
+  return Object.assign({}, monsters, {
+    species: sortedSpecies
+  })
+}
+
+// Anytime the speciesState changes we should recount selected
+function updateSpecies(state, index, updater) {
+  const speciesAtIndex = state.monsters.species[index]
+  const updatedSpecies = Object.assign({}, speciesAtIndex, updater(speciesAtIndex))
+
+  const updatedMonsters = Object.assign({}, state.monsters, {
+    species: Immutable.array.set(state.monsters.species, index, updatedSpecies)
+  })
+
+  const updatedStateWithMonsters = Object.assign({}, state, {
+    monsters: updatedMonsters
+  })
+
+  const {
+    speciesState,
+    selectedCount
+  } = getNewSpeciesState(updatedStateWithMonsters)
+
+  return Object.assign({}, updatedStateWithMonsters, {
+    speciesState,
+    selectedCount
+  })
+}
+
+function updateSpeciesState(state, id, updater) {
+  const {
+    speciesState
+  } = state
+  const newSpecieState = {}
+  const existingSpecieState = speciesState[String(id)]
+
+  newSpecieState[String(id)] = Object.assign(
+    {},
+    existingSpecieState,
+    updater(existingSpecieState)
+  )
+
+  return Object.assign({}, speciesState, newSpecieState)
+}
+
+function updatePokemonState(speciesState, pid, updater) {
+  const existingPokemonByIdState = speciesState.pokemonState[String(pid)]
+
+  const newPokemonByIdState = {}
+  newPokemonByIdState[String(pid)] = Object.assign(
+    {},
+    existingPokemonByIdState,
+    updater(existingPokemonByIdState)
+  )
+  return Object.assign({}, speciesState.pokemonState, newPokemonByIdState)
+}
+
+function updateMonster(state, pokemon, options = {}) {
+  const speciesIndex = pokemon.pokemon_id - 1
+
+  const updatedPokemon = options.remove ? null : pokemon
+
+  return updateSpecies(state, speciesIndex, (speciesAtIndex) => {
+    const index = speciesAtIndex.pokemon.findIndex((p) => p.id === pokemon.id)
+
+    const sorted = getSortedPokemon(Object.assign({}, speciesAtIndex, {
+      pokemon: Immutable.array.set(speciesAtIndex.pokemon, index, updatedPokemon)
+    }), state.speciesState[pokemon.pokemon_id])
+
+    return { // make sure we sort the new pokemon index now that we updated it
+      pokemon: sorted
+    }
+  })
+}
+
+function getNewSortDirectionFromSortBy(sortBy, specieState) {
+  let sortDir = null
+
+  // If we are already sorting this way, flip direction
+  if (sortBy === specieState.sortBy) {
+    sortDir = specieState.sortDir === ASCENDING ? DESCENDING : ASCENDING
+  // Otherwise use descending
+  } else {
+    sortDir = DESCENDING
+  }
+
+  return sortDir
+}
+
+export default handleActions({
+  GET_TRAINER_INFO_SUCCESS(state, action) {
+    return Object.assign({}, state, action.payload)
+  },
+
+  GET_TRAINER_INFO_FAILED(state, action) {
+    ipcRenderer.send('error-message', String(action.payload))
+    return state
+  },
+
+  GET_TRAINER_POKEMON_SUCCESS(state, action) {
+    const monsters = getNewMonsters(state, action.payload, state.sortBy, state.sortDir)
+
+    const updatedStateWithMonsters = Object.assign({}, state, { monsters })
+
+    const {
+      speciesState,
+      selectedCount
+    } = getNewSpeciesState(updatedStateWithMonsters)
+
+    // TODO always sort the data before we return it
+    return Object.assign({}, updatedStateWithMonsters, {
+      speciesState,
+      selectedCount
+    })
+  },
+
+  GET_TRAINER_POKEMON_FAILED(state, action) {
+    console.error(action.payload) // eslint-disable-line
+    return state
+  },
+
+  UPDATE_MONSTER(state, action) {
+    const {
+      pokemon,
+      options
+    } = action.payload
+
+    return updateMonster(state, pokemon, options)
+  },
+
+  UPDATE_SPECIES(state, action) {
+    const {
+      index,
+      updater
+    } = action.payload
+
+    return updateSpecies(state, index, updater)
+  },
+
+  // TODO Maybe just generic UPDATE_TRAINER_STORE
+  // using this too much right now, taking the easy way out of refactoring
+  UPDATE_MONSTER_SORT(state, action) {
+    return Object.assign({}, state, action.payload)
+  },
+
+  SORT_SPECIES(state, action) {
+    const {
+      sortBy,
+      speciesIndex
+    } = action.payload
+
+    const pokemonId = state.monsters.species[speciesIndex].pokemon_id
+    const specieState = state.speciesState[pokemonId]
+
+    const sortDir = getNewSortDirectionFromSortBy(sortBy, specieState)
+
+    const updatedSpeciesState = Object.assign({}, state, {
+      speciesState: updateSpeciesState(state, pokemonId, () => ({ sortDir, sortBy }))
+    })
+
+    return updateSpecies(updatedSpeciesState, speciesIndex, (speciesAtIndex) => {
+      const sorted = getSortedPokemon(speciesAtIndex, null, sortBy, sortDir)
+
+      return {
+        pokemon: sorted
+      }
+    })
+  },
+
+  TOGGLE_FAVORITE_POKEMON_SUCCESS(state, action) {
+    return updateMonster(state, action.payload)
+  },
+
+  TOGGLE_FAVORITE_POKEMON_FAILED(state, action) {
+    console.error(action.payload) // eslint-disable-line
+    return state
+  },
+
+  POWER_UP_POKEMON_SUCCESS(state, action) {
+    const pokemon = action.payload
+    const message = `Upgraded ${pokemon.nickname} succesfully!`
+    const title = `Power Up ${pokemon.nickname}`
+    ipcRenderer.send('information-dialog', message, title)
+
+    return state
+  },
+
+  POWER_UP_POKEMON_FAILED(state, action) {
+    console.error(action.payload) // eslint-disable-line
+    return state
+  },
+
+  RENAME_POKEMON_SUCCESS(state, action) {
+    return updateMonster(state, action.payload)
+  },
+
+  RENAME_POKEMON_FAILED(state, action) {
+    console.error(action.payload) // eslint-disable-line
+    return state
+  },
+
+  TRANSFER_POKEMON_SUCCESS(state, action) {
+    const pokemon = action.payload
+    console.info(`Transferred ${pokemon.id}`) // eslint-disable-line
+    return state
+  },
+
+  TRANSFER_POKEMON_FAILED(state, action) {
+    console.error(action.payload) // eslint-disable-line
+    return state
+  },
+
+  EVOLVE_POKEMON_SUCCESS(state, action) {
+    const pokemon = action.payload
+    console.info(`Evolved ${pokemon.id}`) // eslint-disable-line
+    return state
+  },
+
+  EVOLVE_POKEMON_FAILED(state, action) {
+    console.error(action.payload) // eslint-disable-line
+    return state
+  },
+
+  COLLAPSE_BY_SPECIES(state, action) {
+    const specie = action.payload
+
+    if (specie.count < 1) return state
+
+    return Object.assign({}, state, {
+      speciesState: updateSpeciesState(state, specie.pokemon_id, (speciesState) => {
+        const newCollapsed = !speciesState.collapsed
+
+        return { collapsed: newCollapsed }
+      })
+    })
+  },
+
+  CHECK_ALL_BY_SPECIES(state, action) {
+    const species = action.payload
+
+    let selectedCount = state.selectedCount
+
+    const speciesState = updateSpeciesState(state, species.pokemon_id, (specieState) => {
+      const newCheckAllState = !specieState.checkAll
+      const newPokemonState = {}
+      const ids = Object.keys(specieState.pokemonState)
+
+      ids.forEach(id => {
+        if (newCheckAllState !== specieState.pokemonState[id].check) {
+          if (newCheckAllState) {
+            selectedCount++
+          } else {
+            selectedCount--
+          }
+        }
+
+        newPokemonState[id] = Object.assign(
+          {},
+          specieState.pokemonState[id],
+          { check: newCheckAllState }
+        )
+      })
+
+      return {
+        checkAll: newCheckAllState,
+        pokemonState: newPokemonState
+      }
+    })
+
+    return Object.assign({}, state, {
+      speciesState,
+      selectedCount
+    })
+  },
+
+  CHECK_POKEMON(state, action) {
+    const pokemon = action.payload
+
+    let selectedCount = state.selectedCount
+
+    const speciesState = updateSpeciesState(state,
+      String(pokemon.pokemon_id),
+      (specieState) => {
+        const updatedPokemonState = updatePokemonState(
+          specieState,
+          String(pokemon.id),
+          (pokemonState) => {
+            const newChecked = !pokemonState.check
+
+            if (newChecked) {
+              selectedCount++
+            } else {
+              selectedCount--
+            }
+
+            return { check: newChecked }
+          }
+        )
+
+        return {
+          checkAll: every(updatedPokemonState, { check: true }),
+          pokemonState: updatedPokemonState
+        }
+      }
+    )
+
+    return Object.assign({}, state, {
+      speciesState,
+      selectedCount
+    })
+  },
+
+  SORT_ALL_SPECIES(state, action) {
+    const sortBy = action.payload
+
+    const sortDir = getNewSortDirectionFromSortBy(sortBy, state)
+
+    const monsters = Object.assign({}, state.monsters, {
+      species: getSortedSpecies(state.monsters, sortBy, sortDir)
+    })
+
+    return Object.assign({}, state, {
+      sortDir,
+      sortBy,
+      monsters
+    })
+  },
+
+  SORT_WITH_DEFAULTS(state, action) {
+    const {
+      defaultPokedexSortBy,
+      defaultPokedexSortDirection,
+      defaultSpecieSortBy,
+      defaultSpecieSortDirection,
+    } = action.payload
+
+    const updatedSpeciesAndMonstersState = Object.assign({}, state.monsters, {
+      species: getSortedSpecies(state.monsters, defaultPokedexSortBy, defaultPokedexSortDirection).map((s) => {
+        const sorted = getSortedPokemon(s, null, defaultSpecieSortBy, defaultSpecieSortDirection)
+
+        return Object.assign({}, s, {
+          pokemon: sorted
+        })
+      })
+    })
+
+    const updatedSpeciesState = mapValues(state.speciesState, (specieState) => {
+      const newSpecieState = Object.assign({}, specieState, {
+        sortBy: defaultSpecieSortBy,
+        sortDir: defaultSpecieSortDirection,
+      })
+
+      return newSpecieState
+    })
+
+    return Object.assign({}, state, {
+      monsters: updatedSpeciesAndMonstersState,
+      sortBy: defaultPokedexSortBy,
+      sortDir: defaultPokedexSortDirection,
+      speciesState: updatedSpeciesState,
+    })
+  },
+}, initialState)
diff --git a/app/screens/Detail/components/CinematicMove.js b/app/screens/Detail/components/CinematicMove.js
index f57b633..cfd035f 100644
--- a/app/screens/Detail/components/CinematicMove.js
+++ b/app/screens/Detail/components/CinematicMove.js
@@ -1,7 +1,9 @@
 import React, {
   PropTypes
 } from 'react'
-import times from 'lodash/times'
+import {
+  times
+} from 'lodash'
 
 import Tooltip from '../../Tooltip'
 
diff --git a/app/screens/Detail/components/ModalBody.js b/app/screens/Detail/components/ModalBody.js
index de69d34..5396c00 100644
--- a/app/screens/Detail/components/ModalBody.js
+++ b/app/screens/Detail/components/ModalBody.js
@@ -21,13 +21,11 @@ const ModalBody = React.createClass({
     defense: PropTypes.string.isRequired,
     cpPerUpgrade: PropTypes.string.isRequired,
     candies: PropTypes.number.isRequired,
-    spriteImageName: PropTypes.string.isRequired,
     fastMove: PropTypes.object.isRequired,
     chargedMove: PropTypes.object.isRequired,
     evolvesTo: PropTypes.node,
     possibleQuickMoves: PropTypes.array,
     possibleCinematicMoves: PropTypes.array,
-    monsterUpdater: PropTypes.func,
   },
 
   render() {
@@ -45,13 +43,11 @@ const ModalBody = React.createClass({
       defense,
       cpPerUpgrade,
       candies,
-      spriteImageName,
       fastMove,
       chargedMove,
       evolvesTo,
       possibleQuickMoves,
       possibleCinematicMoves,
-      monsterUpdater,
     } = this.props
 
     const quickMoves = possibleQuickMoves.map((possibleQuickMove, i) =>
@@ -79,7 +75,7 @@ const ModalBody = React.createClass({
           title="Listen to Cry"
           alt="Profile Sprite"
           id="pokemon_profile_sprite"
-          src={`./imgs/3d/${spriteImageName}.jpg`}
+          src={`./imgs/3d/${pokemon.pokemon_id}.png`}
         />
         <audio
           id="pokemonCry"
@@ -93,7 +89,7 @@ const ModalBody = React.createClass({
       </div>
 
       <div id="pokemon_contents">
-        <Nickname pokemon={pokemon} monsterUpdater={monsterUpdater} />
+        <Nickname pokemon={pokemon} />
         <div id="pokemon_health_bar" />
         <div id="pokemon_health">{`HP ${hp}`}</div>
         <div className="pokemon_info">
diff --git a/app/screens/Detail/components/Nickname.js b/app/screens/Detail/components/Nickname.js
index ee43af3..61004e2 100644
--- a/app/screens/Detail/components/Nickname.js
+++ b/app/screens/Detail/components/Nickname.js
@@ -2,14 +2,14 @@ import React, {
   PropTypes
 } from 'react'
 
-import {
-  ipcRenderer
-} from 'electron'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import { renamePokemon } from '../../../actions'
 
 const Nickname = React.createClass({
   propTypes: {
     pokemon: PropTypes.object.isRequired,
-    monsterUpdater: PropTypes.func.isRequired
+    renamePokemon: PropTypes.func.isRequired
   },
 
   getInitialState() {
@@ -19,10 +19,6 @@ const Nickname = React.createClass({
     }
   },
 
-  componentDidMount() {
-    ipcRenderer.on('rename-pokemon-complete', this.handleRenameComplete)
-  },
-
   componentDidUpdate() {
     if (this.state.editing) {
       this.lastActiveElement = document.activeElement
@@ -33,10 +29,6 @@ const Nickname = React.createClass({
     }
   },
 
-  componentWillUnmount() {
-    ipcRenderer.removeListener('rename-pokemon-complete', this.handleRenameComplete)
-  },
-
   render() {
     const {
       editing,
@@ -50,6 +42,7 @@ const Nickname = React.createClass({
           className="input-lg"
           onKeyPress={this.handleKeyPress}
           defaultValue={newNickname}
+          maxLength="12"
           placeholder="Enter a new nickname"
           ref={(c) => { this.input = c }}
         />
@@ -78,27 +71,27 @@ const Nickname = React.createClass({
 
   handleKeyPress(e) {
     if (e.key === 'Enter') {
-      ipcRenderer.send('rename-pokemon', this.props.pokemon.id, e.target.value)
+      this.props.renamePokemon(this.props.pokemon, e.target.value, (updatedPokemon) => {
+        this.handleRenameComplete(updatedPokemon)
+      })
     }
   },
 
-  handleRenameComplete(event, id, nickname) {
+  handleRenameComplete(updatedPokemon) {
     const {
       pokemon
     } = this.props
 
-    if (id !== pokemon.id) return
-
-    const updatedPokemon = Object.assign({}, pokemon, { nickname })
-
-    this.props.monsterUpdater(updatedPokemon)
+    if (updatedPokemon.id !== pokemon.id) return
 
     this.setState({
-      newNickname: nickname,
+      newNickname: updatedPokemon.nickname,
       editing: false
     })
   }
 
 })
 
-export default Nickname
+export default connect(null, dispatch => bindActionCreators({
+  renamePokemon
+}, dispatch))(Nickname)
diff --git a/app/screens/Detail/index.js b/app/screens/Detail/index.js
index a6be55d..451e0d2 100644
--- a/app/screens/Detail/index.js
+++ b/app/screens/Detail/index.js
@@ -2,6 +2,9 @@ import React, {
   PropTypes
 } from 'react'
 import ReactDOM from 'react-dom'
+import { Provider } from 'react-redux'
+
+import store from '../../store'
 
 import ModalBody from './components/ModalBody'
 
@@ -21,7 +24,7 @@ const ModalDialog = React.createClass({
   },
 
   render() {
-    let modalBackground = {
+    const modalBackground = {
       background: `linear-gradient(to bottom,
       ${this.getBackgroundColor(this.props.type[0])} 0%,
       ${this.getBackgroundColor(this.props.type[1])} 100%)`
@@ -84,13 +87,13 @@ const ModalDialog = React.createClass({
   },
 })
 
-export default ($detailModal, pokemon, species, monsterUpdater) => {
+export default ($detailModal, pokemon, species) => {
   // Calculate CP Progress dot position
   const minDeg = 0
   const maxDeg = 180
   const degree = Math.max(Math.min((pokemon.cp / pokemon.max_cp) * maxDeg, maxDeg), minDeg)
 
-  let transform = `rotate(${degree}deg) translate(-193px)`
+  const transform = `rotate(${degree}deg) translate(-193px)`
 
   const stats = baseStats.pokemon[pokemon.pokemon_id]
 
@@ -98,35 +101,29 @@ export default ($detailModal, pokemon, species, monsterUpdater) => {
   const baseDefense = stats.BaseDefense
 
   // TODO Need additional information to calculate these
-  let hp = `${pokemon.current_stamina} / ${pokemon.stamina_max}`
-  let attack = `${baseAttack + pokemon.attack}`
-  let defense = `${baseDefense + pokemon.defense}`
-  let type = stats.types
+  const hp = `${pokemon.current_stamina} / ${pokemon.stamina_max}`
+  const attack = `${baseAttack + pokemon.attack}`
+  const defense = `${baseDefense + pokemon.defense}`
+  const type = stats.types
 
   const cppu = stats.cpPerUpgrade
-  let cpPerUpgrade = cppu ? `+${cppu} CP (+/-)` : 'Unknown'
-
-  let height = `${pokemon.height.toFixed(2)}`
-  let weight = `${pokemon.weight.toFixed(2)}`
+  const cpPerUpgrade = cppu ? `+${cppu} CP (+/-)` : 'Unknown'
 
-  let candies = species.candy
-  let name = species.name
-  let nickname = pokemon.nickname
-  let spriteImageName = name.toLowerCase()
+  const height = `${pokemon.height.toFixed(2)}`
+  const weight = `${pokemon.weight.toFixed(2)}`
 
-  let moveOne = baseStats.moves[pokemon.move_1]
-  let moveTwo = baseStats.moves[pokemon.move_2]
+  const candies = species.candy
+  const name = species.name
+  const nickname = pokemon.nickname
 
-  if (spriteImageName.indexOf('nidoran') > -1) {
-    const spriteParts = spriteImageName.split(' ')
-    spriteImageName = `${spriteParts[0]}-${(spriteParts[1][0] === '♂') ? 'm' : 'f'}`
-  }
+  const moveOne = baseStats.moves[pokemon.move_1]
+  const moveTwo = baseStats.moves[pokemon.move_2]
 
-  let possibleQuickMoves = stats.quickMoves.map((quickMove) =>
+  const possibleQuickMoves = stats.quickMoves.map((quickMove) =>
     baseStats.moves[quickMove]
   )
 
-  let possibleCinematicMoves = stats.cinematicMoves.map((cinematicMove) =>
+  const possibleCinematicMoves = stats.cinematicMoves.map((cinematicMove) =>
     baseStats.moves[cinematicMove]
   )
 
@@ -143,7 +140,6 @@ export default ($detailModal, pokemon, species, monsterUpdater) => {
     cp={pokemon.cp}
     maxCP={pokemon.max_cp}
     cpPerUpgrade={cpPerUpgrade}
-    spriteImageName={spriteImageName}
     type={type}
     weight={weight}
     height={height}
@@ -153,12 +149,11 @@ export default ($detailModal, pokemon, species, monsterUpdater) => {
     evolvesTo={stats.evolvesTo}
     possibleQuickMoves={possibleQuickMoves}
     possibleCinematicMoves={possibleCinematicMoves}
-    monsterUpdater={monsterUpdater}
   />)
 
   $detailModal.on('hidden.bs.modal', () => {
     ReactDOM.unmountComponentAtNode($detailModal.get(0))
   })
 
-  ReactDOM.render(modalDialog, $detailModal.get(0))
+  ReactDOM.render(<Provider store={store}>{modalDialog}</Provider>, $detailModal.get(0))
 }
diff --git a/app/screens/Login/components/LoginFormContainer.js b/app/screens/Login/components/LoginFormContainer.js
index 41786a5..1bb3ad0 100644
--- a/app/screens/Login/components/LoginFormContainer.js
+++ b/app/screens/Login/components/LoginFormContainer.js
@@ -2,6 +2,17 @@ import React, {
   PropTypes
 } from 'react'
 import { ipcRenderer } from 'electron'
+import { connect } from 'react-redux'
+import { bindActionCreators } from 'redux'
+import {
+  ProgressBar
+} from 'react-bootstrap'
+
+import {
+  checkAndDeleteCredentials,
+  saveAccountCredentials,
+  login
+} from '../../../actions'
 
 const AUTH_METHODS = {
   ptc: 'ptc',
@@ -12,7 +23,11 @@ const LoginForm = React.createClass({
   displayName: 'LoginForm',
 
   propTypes: {
-    credentials: PropTypes.object
+    credentials: PropTypes.object,
+    checkAndDeleteCredentials: PropTypes.func.isRequired,
+    saveAccountCredentials: PropTypes.func.isRequired,
+    login: PropTypes.func.isRequired,
+    authenticating: PropTypes.bool.isRequired,
   },
 
   getInitialState() {
@@ -23,9 +38,22 @@ const LoginForm = React.createClass({
 
   render() {
     const {
-      credentials
+      credentials,
+      authenticating,
     } = this.props
 
+    if (authenticating) {
+      return (
+        <div className="container">
+          <ProgressBar
+            now={100}
+            active
+            bsStyle="info"
+          />
+        </div>
+      )
+    }
+
     return (
       <div className="container">
         <div className="form-group btn-group" data-toggle="buttons">
@@ -96,7 +124,7 @@ const LoginForm = React.createClass({
             <input
               type="checkbox"
               id="remember-cb"
-              defaultChecked={credentials.success || false}
+              defaultChecked={(credentials.password && credentials.username) || false}
               ref={(c) => { this.rememberMe = c }}
             />
             {" Remember me"}
@@ -127,6 +155,8 @@ const LoginForm = React.createClass({
   },
 
   handleLogin() {
+    if (this.props.authenticating) return
+
     const method = this.state.authMethod
 
     if (this.username.value === '' || this.password.value === '') {
@@ -134,14 +164,27 @@ const LoginForm = React.createClass({
       return
     }
 
+    const credentials = {
+      method,
+      username: this.username.value,
+      password: this.password.value
+    }
+
     if (this.rememberMe.checked) {
-      ipcRenderer.send('save-account-credentials', method, this.username.value, this.password.value)
+      this.props.saveAccountCredentials(credentials)
     } else {
-      ipcRenderer.send('check-and-delete-credentials')
+      this.props.checkAndDeleteCredentials()
     }
 
-    ipcRenderer.send('pokemon-login', method, this.username.value, this.password.value)
+    this.props.login(credentials)
   }
 })
 
-export default LoginForm
+
+export default connect((state => ({
+  authenticating: state.authenticate.authenticating,
+})), (dispatch => bindActionCreators({
+  checkAndDeleteCredentials,
+  saveAccountCredentials,
+  login
+}, dispatch)))(LoginForm)
diff --git a/app/screens/Login/index.js b/app/screens/Login/index.js
index 6e019bc..9014b3d 100644
--- a/app/screens/Login/index.js
+++ b/app/screens/Login/index.js
@@ -1,11 +1,13 @@
-import React from 'react'
-import { ipcRenderer } from 'electron'
+import React, {
+  PropTypes
+} from 'react'
+import { connect } from 'react-redux'
 
 import LoginForm from './components/LoginFormContainer'
 
 const Login = React.createClass({
-  getInitialState() {
-    return { credentials: ipcRenderer.sendSync('get-account-credentials') }
+  propTypes: {
+    credentials: PropTypes.object,
   },
 
   render() {
@@ -16,10 +18,12 @@ const Login = React.createClass({
           <h4>A tool for Pokémon Go to aid in transferring and evolving Pokémon</h4>
         </header>
 
-        <LoginForm credentials={this.state.credentials} />
+        <LoginForm credentials={this.props.credentials} />
       </div>
     )
   }
 })
 
-export default Login
+export default connect(state => ({
+  credentials: state.authenticate.credentials,
+}))(Login)
diff --git a/app/screens/Menu/index.js b/app/screens/Menu/index.js
new file mode 100644
index 0000000..9dcba46
--- /dev/null
+++ b/app/screens/Menu/index.js
@@ -0,0 +1,49 @@
+import React, {
+  PropTypes
+} from 'react'
+import { connect } from 'react-redux'
+import { bindActionCreators } from 'redux'
+import $ from 'jquery'
+import {
+  updateStatus,
+  logout
+} from '../../actions'
+import renderSettings from '../Settings'
+
+const Menu = require('react-burger-menu').slide
+
+const MainMenu = React.createClass({
+  propTypes: {
+    updateStatus: PropTypes.func.isRequired,
+    logout: PropTypes.func.isRequired
+  },
+
+  render() {
+    return (
+      <Menu>
+        <div>
+          <ul className="nav navbar-nav">
+            <li><a onClick={this.handleClickSettings}>Settings <i className="glyphicon glyphicon-cog" /></a></li>
+            {
+              // <li><a>Trainer Info <i className="glyphicon glyphicon-user" /></a></li>
+              // <li><a>Applied Items <i className="glyphicon glyphicon-chevron-down" /></a></li>
+              // <li><a>Inventory <i className="glyphicon glyphicon-chevron-down" /></a></li>
+              // <li><a>Eggs <i className="glyphicon glyphicon-chevron-down" /></a></li>
+            }
+            <li><a onClick={this.handleSignOut}>Sign Out <i className="glyphicon glyphicon-off" /></a></li>
+          </ul>
+        </div>
+      </Menu>
+    )
+  },
+
+  handleClickSettings() {
+    renderSettings($(document.getElementById('settingsModal')))
+  },
+
+  handleSignOut() {
+    this.props.logout()
+  },
+})
+
+export default connect(null, (dispatch => bindActionCreators({ updateStatus, logout }, dispatch)))(MainMenu)
diff --git a/app/screens/Settings/components/ModalBody.js b/app/screens/Settings/components/ModalBody.js
new file mode 100644
index 0000000..9f6e5c5
--- /dev/null
+++ b/app/screens/Settings/components/ModalBody.js
@@ -0,0 +1,263 @@
+import React, {
+  PropTypes
+} from 'react'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import {
+  FormGroup,
+  Checkbox,
+  HelpBlock,
+  ControlLabel,
+  FormControl,
+  Panel,
+} from 'react-bootstrap'
+
+import {
+  toggleShowSpeciesWithZeroPokemon,
+  resetAllSettings,
+  checkAndDeleteCredentials,
+  toggleAutoLogin,
+  changeDefaultPokedexSortBy,
+  changeDefaultPokedexSortDirection,
+  changeDefaultSpecieSortBy,
+  changeDefaultSpecieSortDirection,
+  sortWithDefaults,
+} from '../../../actions'
+
+function SettingFieldGroupCheckbox({ label, help, ...props }) {
+  return (
+    <FormGroup>
+      <Checkbox {...props} >
+        {label}
+      </Checkbox>
+      {help && <HelpBlock>{help}</HelpBlock>}
+    </FormGroup>
+  )
+}
+
+SettingFieldGroupCheckbox.propTypes = {
+  id: PropTypes.string.isRequired,
+  label: PropTypes.string.isRequired,
+  help: PropTypes.string,
+}
+
+function SettingFieldGroupSelect({ id, label, help, options, ...props }) {
+  const optionComponents = options.map((option, i) => (<option key={i} value={option}>{option}</option>))
+
+  return (
+    <FormGroup controlId={id}>
+      <ControlLabel>{label}</ControlLabel>
+      <FormControl componentClass="select" placeholder="select" {...props}>
+        {optionComponents}
+      </FormControl>
+      {help && <HelpBlock>{help}</HelpBlock>}
+    </FormGroup>
+  )
+}
+
+SettingFieldGroupSelect.propTypes = {
+  id: PropTypes.string.isRequired,
+  label: PropTypes.string.isRequired,
+  help: PropTypes.string,
+  options: PropTypes.array.isRequired,
+}
+
+const pokedexSortByOptions = [
+  'pokemon_id',
+  'name',
+  'count',
+  'candy',
+  'evolves',
+]
+
+const sortDirectionOptions = [
+  'ascending',
+  'descending',
+]
+
+const specieSortByOptions = [
+  'favorite',
+  'name',
+  'nickname',
+  'cp',
+  'iv',
+]
+
+const ModalBody = React.createClass({
+  displayName: 'ModalBody',
+
+  propTypes: {
+    toggleShowSpeciesWithZeroPokemon: PropTypes.func.isRequired,
+    resetAllSettings: PropTypes.func.isRequired,
+    checkAndDeleteCredentials: PropTypes.func.isRequired,
+    showSpeciesWithZeroPokemon: PropTypes.bool.isRequired,
+    toggleAutoLogin: PropTypes.func.isRequired,
+    autoLogin: PropTypes.bool.isRequired,
+    changeDefaultPokedexSortBy: PropTypes.func.isRequired,
+    changeDefaultPokedexSortDirection: PropTypes.func.isRequired,
+    changeDefaultSpecieSortBy: PropTypes.func.isRequired,
+    changeDefaultSpecieSortDirection: PropTypes.func.isRequired,
+    defaultPokedexSortBy: PropTypes.string.isRequired,
+    defaultPokedexSortDirection: PropTypes.string.isRequired,
+    defaultSpecieSortBy: PropTypes.string.isRequired,
+    defaultSpecieSortDirection: PropTypes.string.isRequired,
+    sortWithDefaults: PropTypes.func.isRequired,
+  },
+
+  render() {
+    const {
+      defaultPokedexSortBy,
+      defaultPokedexSortDirection,
+      defaultSpecieSortBy,
+      defaultSpecieSortDirection,
+    } = this.props
+
+    return (
+      <div className="modal-body">
+        <Panel header="Table Configuration" bsStyle="primary">
+          <SettingFieldGroupCheckbox
+            label="Display Uncaught Species"
+            checked={this.props.showSpeciesWithZeroPokemon}
+            help="If you have no Mew, this will display them when enabled."
+            onChange={this.handleToggleShowAllSpecies}
+            id="displayUncaught"
+          />
+          <SettingFieldGroupSelect
+            label="Default Pokedex Sort By"
+            id="defaultPokedexSortBy"
+            onChange={this.handleDefaultPokedexSortByChange}
+            defaultValue={defaultPokedexSortBy}
+            options={pokedexSortByOptions}
+          />
+          <SettingFieldGroupSelect
+            label="Default Pokedex Sort Direction"
+            onChange={this.handleDefaultPokedexSortDirectionChange}
+            defaultValue={defaultPokedexSortDirection === 'ASC' ? sortDirectionOptions[0] : sortDirectionOptions[1]}
+            options={sortDirectionOptions}
+            id="defaultPokedexSortDirection"
+          />
+          <SettingFieldGroupSelect
+            label="Default Specie Sort By"
+            id="defaultSpecieSortBy"
+            onChange={this.handleDefaultSpecieSortByChange}
+            defaultValue={defaultSpecieSortBy}
+            options={specieSortByOptions}
+          />
+          <SettingFieldGroupSelect
+            label="Default Specie Sort Direction"
+            onChange={this.handleDefaultSpecieSortDirectionChange}
+            defaultValue={defaultSpecieSortDirection === 'ASC' ? sortDirectionOptions[0] : sortDirectionOptions[1]}
+            options={sortDirectionOptions}
+            id="defaultSpecieSortDirection"
+          />
+          <button
+            type="button"
+            className="btn btn-primary"
+            onClick={this.handleSortWithDefaults}
+          >
+            Sort with Defaults
+          </button>
+        </Panel>
+        <Panel header="Other">
+          <SettingFieldGroupCheckbox
+            label="Automatically Login"
+            checked={this.props.autoLogin}
+            help="Authenticate with stored credentials on launch."
+            onChange={this.handleToggleAutoLogin}
+            id="autoLogin"
+          />
+          <div className="form-group">
+            <button
+              type="button"
+              className="btn btn-danger"
+              onClick={this.handleDeleteCredentials}
+            >
+              Delete Stored Credentials
+            </button>
+          </div>
+          <div className="form-group">
+            <button
+              type="button"
+              className="btn btn-danger"
+              onClick={this.handleReset}
+            >
+              Reset All Settings
+            </button>
+          </div>
+        </Panel>
+      </div>
+    )
+  },
+
+  getDirection(value) {
+    return value === sortDirectionOptions[0] ? 'ASC' : 'DESC'
+  },
+
+  handleSortWithDefaults() {
+    const {
+      defaultPokedexSortBy,
+      defaultPokedexSortDirection,
+      defaultSpecieSortBy,
+      defaultSpecieSortDirection,
+    } = this.props
+
+    this.props.sortWithDefaults({
+      defaultPokedexSortBy,
+      defaultPokedexSortDirection,
+      defaultSpecieSortBy,
+      defaultSpecieSortDirection,
+    })
+  },
+
+  handleDefaultPokedexSortDirectionChange(e) {
+    this.props.changeDefaultPokedexSortDirection(this.getDirection(e.target.value))
+  },
+
+  handleDefaultPokedexSortByChange(e) {
+    this.props.changeDefaultPokedexSortBy(e.target.value)
+  },
+
+  handleDefaultSpecieSortDirectionChange(e) {
+    this.props.changeDefaultSpecieSortDirection(this.getDirection(e.target.value))
+  },
+
+  handleDefaultSpecieSortByChange(e) {
+    this.props.changeDefaultSpecieSortBy(e.target.value)
+  },
+
+  handleToggleAutoLogin() {
+    this.props.toggleAutoLogin()
+  },
+
+  handleToggleShowAllSpecies() {
+    this.props.toggleShowSpeciesWithZeroPokemon()
+  },
+
+  handleReset() {
+    this.props.resetAllSettings()
+  },
+
+  handleDeleteCredentials() {
+    this.props.checkAndDeleteCredentials()
+  },
+})
+
+
+export default connect((state => ({
+  showSpeciesWithZeroPokemon: state.settings.showSpeciesWithZeroPokemon,
+  autoLogin: state.settings.autoLogin,
+  defaultPokedexSortBy: state.settings.defaultPokedexSortBy,
+  defaultPokedexSortDirection: state.settings.defaultPokedexSortDirection,
+  defaultSpecieSortBy: state.settings.defaultSpecieSortBy,
+  defaultSpecieSortDirection: state.settings.defaultSpecieSortDirection,
+})), (dispatch => bindActionCreators({
+  toggleShowSpeciesWithZeroPokemon,
+  resetAllSettings,
+  checkAndDeleteCredentials,
+  toggleAutoLogin,
+  changeDefaultPokedexSortBy,
+  changeDefaultPokedexSortDirection,
+  changeDefaultSpecieSortBy,
+  changeDefaultSpecieSortDirection,
+  sortWithDefaults,
+}, dispatch)))(ModalBody)
diff --git a/app/screens/Settings/index.js b/app/screens/Settings/index.js
new file mode 100644
index 0000000..53140ad
--- /dev/null
+++ b/app/screens/Settings/index.js
@@ -0,0 +1,54 @@
+import React, {
+  PropTypes
+} from 'react'
+import ReactDOM from 'react-dom'
+import { Provider } from 'react-redux'
+
+import store from '../../store'
+
+import ModalBody from './components/ModalBody'
+
+const ModalDialog = React.createClass({
+  displayName: 'ModalDialog',
+
+  propTypes: {
+    $modal: PropTypes.object.isRequired,
+  },
+
+  componentDidMount() {
+    this.props.$modal.modal('show')
+  },
+
+  render() {
+    return (
+      <div className="modal-dialog" role="document">
+        <div className="modal-content">
+          <div className="modal-header modal-outline-white">
+            <button type="button" className="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+            <h4 className="modal-title" id="settingsModalLabel">
+              Settings
+            </h4>
+          </div>
+          <ModalBody {...this.props} />
+          <div className="modal-footer">
+            <div type="button" className="btn btn-default" data-dismiss="modal" >Close</div>
+          </div>
+        </div>
+      </div>
+    )
+  },
+})
+
+export default ($modal) => {
+  const modalDialog = (<ModalDialog
+    $modal={$modal}
+  />)
+
+  $modal.on('hidden.bs.modal', () => {
+    ReactDOM.unmountComponentAtNode($modal.get(0))
+  })
+
+  ReactDOM.render(<Provider store={store}>{modalDialog}</Provider>, $modal.get(0))
+}
diff --git a/app/screens/Table/components/CheckCounter.js b/app/screens/Table/components/CheckCounter.js
index 0772f95..a59da17 100644
--- a/app/screens/Table/components/CheckCounter.js
+++ b/app/screens/Table/components/CheckCounter.js
@@ -1,34 +1,28 @@
-import React from 'react'
-
-let counter = 0
+import React, {
+  PropTypes
+} from 'react'
+import { connect } from 'react-redux'
 
 const CheckCounter = React.createClass({
   displayName: 'CheckCounter',
 
-  getInitialState() {
-    return { count: counter }
+  propTypes: {
+    selectedCount: PropTypes.number.isRequired
   },
 
   render() {
-    let {
-      count
-    } = this.state
+    const {
+      selectedCount
+    } = this.props
 
     return (
       <span>
-      Selected: {count}
+        Selected: {selectedCount}
       </span>
     )
-  },
-
-  handleRecount(changes) {
-    counter += changes
-
-    this.setState({
-      count: counter
-    })
   }
-
 })
 
-export default CheckCounter
+export default connect(state => ({
+  selectedCount: state.trainer.selectedCount
+}))(CheckCounter)
diff --git a/app/screens/Table/components/Pokemon.js b/app/screens/Table/components/Pokemon.js
index 31d4fe6..2b2ae6b 100644
--- a/app/screens/Table/components/Pokemon.js
+++ b/app/screens/Table/components/Pokemon.js
@@ -3,6 +3,12 @@ import React, {
 } from 'react'
 import { ipcRenderer } from 'electron'
 import $ from 'jquery'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+import {
+  toggleFavoritePokemon,
+  powerUpPokemon
+} from '../../../actions'
 
 import renderModal from '../../Detail'
 import Tooltip from '../../Tooltip'
@@ -23,11 +29,9 @@ const Pokemon = React.createClass({
     species: PropTypes.object.isRequired,
     checkAll: PropTypes.bool.isRequired,
     onCheckAll: PropTypes.func.isRequired,
-    pokemonState: PropTypes.object.isRequired
-  },
-
-  contextTypes: {
-    monsterUpdater: React.PropTypes.func.isRequired
+    pokemonState: PropTypes.object.isRequired,
+    toggleFavoritePokemon: PropTypes.func.isRequired,
+    powerUpPokemon: PropTypes.func.isRequired,
   },
 
   render() {
@@ -238,19 +242,17 @@ const Pokemon = React.createClass({
 
   handleClickPowerup(pokemon) {
     if (ipcRenderer.sendSync('confirmation-dialog', 'power up').success) {
-      ipcRenderer.send('power-up-pokemon', pokemon.id, pokemon.nickname)
       // TODO Calculate and update the pokemon immediately with estimates
+      this.props.powerUpPokemon(pokemon)
     }
   },
 
   handleClickFavorite(pokemon) {
-    ipcRenderer.send('favorite-pokemon', pokemon.id, !pokemon.favorite)
-    const updatedPokemon = Object.assign(pokemon, { favorite: !pokemon.favorite ? -1 : -0 })
-    this.context.monsterUpdater(updatedPokemon)
+    this.props.toggleFavoritePokemon(pokemon)
   },
 
   handleClickNickname(pokemon, species) {
-    renderModal($(document.getElementById('detailModal')), pokemon, species, this.context.monsterUpdater)
+    renderModal($(document.getElementById('detailModal')), pokemon, species)
   },
 
   handleSortPokemon(sortBy) {
@@ -277,4 +279,7 @@ const Pokemon = React.createClass({
 
 })
 
-export default Pokemon
+export default connect(null, dispatch => bindActionCreators({
+  toggleFavoritePokemon,
+  powerUpPokemon
+}, dispatch))(Pokemon)
diff --git a/app/screens/Table/components/Species.js b/app/screens/Table/components/Species.js
index 01198fd..3be278f 100644
--- a/app/screens/Table/components/Species.js
+++ b/app/screens/Table/components/Species.js
@@ -1,8 +1,18 @@
 import React, {
   PropTypes
 } from 'react'
-import every from 'lodash/every'
-import isEqual from 'lodash/isEqual'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+
+import {
+  updateMonsterSort,
+  updateSpecies,
+  sortSpecies,
+  checkPokemon,
+  checkAllBySpecies,
+  collapseBySpecies,
+  sortAllSpecies,
+} from '../../../actions'
 
 import PokemonTable from './Pokemon'
 
@@ -10,31 +20,19 @@ const Species = React.createClass({
   displayName: 'Species',
 
   propTypes: {
-    updateCheckedCount: PropTypes.func,
     sortBy: PropTypes.string,
     sortDir: PropTypes.string,
     filterBy: PropTypes.string,
-    sortSpeciesBy: PropTypes.func,
-    updateSpecies: PropTypes.func,
-    getSortedPokemon: PropTypes.func,
-    monsters: PropTypes.object.isRequired
-  },
-
-  getInitialState() {
-    const species = this.getNewSpeciesStateFromProps(this.props)
-
-    return {
-      species,
-      showSpeciesWithZeroPokemon: true
-    }
-  },
-
-  componentWillReceiveProps(nextProps) {
-    if (!isEqual(this.props.monsters.species, nextProps.monsters.species)) {
-      this.setState({
-        species: this.getNewSpeciesStateFromProps(nextProps)
-      })
-    }
+    sortSpecies: PropTypes.func.isRequired,
+    monsters: PropTypes.object.isRequired,
+    updateMonsterSort: PropTypes.func.isRequired,
+    showSpeciesWithZeroPokemon: PropTypes.bool.isRequired,
+    updateSpecies: PropTypes.func.isRequired,
+    speciesState: PropTypes.object,
+    checkPokemon: PropTypes.func.isRequired,
+    checkAllBySpecies: PropTypes.func.isRequired,
+    collapseBySpecies: PropTypes.func.isRequired,
+    sortAllSpecies: PropTypes.func.isRequired,
   },
 
   render() {
@@ -124,15 +122,11 @@ const Species = React.createClass({
 
   getSpeciesBody(monsterSpecies) {
     const {
-      filterBy
+      filterBy,
+      showSpeciesWithZeroPokemon,
+      speciesState
     } = this.props
 
-    const speciesState = this.state.species
-
-    const {
-      showSpeciesWithZeroPokemon
-    } = this.state
-
     return monsterSpecies.map((specie, i) => {
       if (!showSpeciesWithZeroPokemon && specie.count < 1) {
         return null
@@ -192,14 +186,6 @@ const Species = React.createClass({
     />)
   },
 
-  getInitialPokemonState(specie) {
-    const pokemonState = {}
-    specie.pokemon.forEach((p) => {
-      pokemonState[p.id] = { check: false }
-    })
-    return pokemonState
-  },
-
   getSortDirectionClassName(key) {
     const {
       sortBy,
@@ -213,205 +199,54 @@ const Species = React.createClass({
     return 'sorting'
   },
 
-  updateSpeciesState(id, updater) {
-    const newSpecieState = {}
-    const existingSpecieState = this.state.species[String(id)]
-
-    newSpecieState[String(id)] = Object.assign(
-      {},
-      existingSpecieState,
-      updater(existingSpecieState)
-    )
-
-    return Object.assign({}, this.state.species, newSpecieState)
-  },
-
-  updatePokemonState(speciesState, pid, updater) {
-    const existingPokemonByIdState = speciesState.pokemonState[String(pid)]
-
-    const newPokemonByIdState = {}
-    newPokemonByIdState[String(pid)] = Object.assign(
-      {},
-      existingPokemonByIdState,
-      updater(existingPokemonByIdState)
-    )
-    return Object.assign({}, speciesState.pokemonState, newPokemonByIdState)
-  },
-
-  sortPokemonBy(newSortBy, speciesIndex) {
-    const pokemonId = this.props.monsters.species[speciesIndex].pokemon_id
-
-    const {
+  sortPokemonBy(sortBy, speciesIndex) {
+    this.props.sortSpecies({
+      speciesIndex,
       sortBy,
-      sortDir
-    } = this.state.species[pokemonId]
-
-    let newSortDir = null
-
-    if (newSortBy === sortBy) {
-      newSortDir = sortDir === 'ASC' ? 'DESC' : 'ASC'
-    } else {
-      newSortDir = 'DESC'
-    }
-
-    this.setState({
-      species: this.updateSpeciesState(pokemonId, () => {
-        const sortState = { sortDir: newSortDir, sortBy: newSortBy }
-
-        return sortState
-      })
-    }, () => {
-      this.props.updateSpecies(speciesIndex, (speciesAtIndex) => {
-        const sorted = this.props.getSortedPokemon(speciesAtIndex, newSortBy, newSortDir)
-        return {
-          pokemon: sorted
-        }
-      })
-    })
-  },
-
-  getPokemonChecked() {
-    const species = this.props.monsters.species
-    const speciesState = this.state.species
-    const checkedPokemon = []
-
-    species.forEach((specie) => {
-      specie.pokemon.forEach((p) => {
-        if (speciesState[specie.pokemon_id].pokemonState[p.id].check) {
-          checkedPokemon.push(p)
-        }
-      })
     })
-
-    return checkedPokemon
   },
 
   getSortState(specie) {
+    const {
+      speciesState
+    } = this.props
+
     const {
       sortBy,
       sortDir
-    } = this.state.species[specie.pokemon_id]
+    } = speciesState[specie.pokemon_id]
 
     return { sortBy, sortDir }
   },
 
   handleCollapse(specie) {
-    if (specie.count < 1) return
-
-    this.setState({
-      species: this.updateSpeciesState(specie.pokemon_id, (speciesState) => {
-        const newCollapsed = !speciesState.collapsed
-
-        return { collapsed: newCollapsed }
-      })
-    })
+    this.props.collapseBySpecies(specie)
   },
 
   handleCheckAll(species) {
-    this.setState({
-      species: this.updateSpeciesState(species.pokemon_id, (speciesState) => {
-        const newCheckAllState = !speciesState.checkAll
-        const newPokemonState = {}
-        const ids = Object.keys(speciesState.pokemonState)
-
-        ids.forEach(id => {
-          if (newCheckAllState !== speciesState.pokemonState[id].check) {
-            this.props.updateCheckedCount(newCheckAllState ? 1 : -1)
-          }
-
-          newPokemonState[id] = Object.assign(
-            {},
-            speciesState.pokemonState[id],
-            { check: newCheckAllState }
-          )
-        })
-
-        return {
-          checkAll: newCheckAllState,
-          pokemonState: newPokemonState
-        }
-      })
-    })
+    this.props.checkAllBySpecies(species)
   },
 
   handleCheckedChange(pokemon) {
-    this.setState({
-      species: this.updateSpeciesState(
-        String(pokemon.pokemon_id),
-        (speciesState) => {
-          const updatedPokemonState = this.updatePokemonState(
-            speciesState,
-            String(pokemon.id),
-            (pokemonState) => {
-              const newChecked = !pokemonState.check
-              this.props.updateCheckedCount(newChecked ? 1 : -1)
-              return { check: newChecked }
-            }
-          )
-
-          return {
-            checkAll: every(updatedPokemonState, { check: true }),
-            pokemonState: updatedPokemonState
-          }
-        }
-      )
-    })
+    this.props.checkPokemon(pokemon)
   },
 
-  handleSortSpecies(sortBy) {
-    this.props.sortSpeciesBy(sortBy)
-  },
-
-  getNewSpeciesStateFromProps(props) {
-    const speciesState = {}
-
-    const sortBy = 'cp'
-    const sortDir = 'DESC'
-
-    props.monsters.species.forEach((specie) => {
-      const pid = String(specie.pokemon_id)
-      let existingSpecieState = null
-
-      if (this.state) existingSpecieState = this.state.species[pid]
-
-      // specie state already exists
-      if (existingSpecieState) {
-        const updatedSpecieState = { pokemonState: {} }
-        let checkAll = true
-        specie.pokemon.forEach((p) => {
-          // pokemon already exists
-          if (existingSpecieState.pokemonState[p.id]) {
-            updatedSpecieState.pokemonState[p.id] = existingSpecieState.pokemonState[p.id]
-            checkAll = checkAll && updatedSpecieState.pokemonState[p.id].check
-          // pokemon does not exist
-          } else {
-            updatedSpecieState.pokemonState[p.id] = { check: false }
-            checkAll = false
-          }
-        })
-        updatedSpecieState.checkAll = checkAll
-        speciesState[pid] = Object.assign({}, existingSpecieState, updatedSpecieState)
-      // specie state does not exist
-      } else {
-        speciesState[pid] = {
-          pokemonState: this.getInitialPokemonState(specie),
-          checkAll: false,
-          collapsed: true,
-          sortBy,
-          sortDir
-        }
-      }
-    })
-
-    return speciesState
+  handleSortSpecies(newSortBy) {
+    this.props.sortAllSpecies(newSortBy)
   },
 
-  toggleShowAllSpecies() {
-    this.setState({
-      showSpeciesWithZeroPokemon: !this.state.showSpeciesWithZeroPokemon
-    })
-  }
-
 })
 
-export default Species
+export default connect((state => ({
+  showSpeciesWithZeroPokemon: state.settings.showSpeciesWithZeroPokemon,
+  speciesState: state.trainer.speciesState,
+  monsters: state.trainer.monsters,
+})), (dispatch => bindActionCreators({
+  updateMonsterSort,
+  updateSpecies,
+  sortSpecies,
+  checkPokemon,
+  checkAllBySpecies,
+  collapseBySpecies,
+  sortAllSpecies,
+}, dispatch)))(Species)
diff --git a/app/screens/Table/components/Status.js b/app/screens/Table/components/Status.js
index 4121fdd..a23b27c 100644
--- a/app/screens/Table/components/Status.js
+++ b/app/screens/Table/components/Status.js
@@ -1,9 +1,6 @@
 import React, {
   PropTypes
 } from 'react'
-// import {
-//   ipcRenderer
-// } from 'electron'
 import {
   connect
 } from 'react-redux'
@@ -46,8 +43,7 @@ const Status = React.createClass({
       <div className="status-container">
         <div className="row col-sm-12">
           <div className="col-sm-6 status">
-            {'Status: '}
-            <span>{label}</span>
+            <span>{`Status: ${label}`}</span>
           </div>
           <div className="col-sm-6 progressbar">
             <Progress progress={this.props.status} />
diff --git a/app/screens/Table/index.js b/app/screens/Table/index.js
index 2123b64..883751b 100644
--- a/app/screens/Table/index.js
+++ b/app/screens/Table/index.js
@@ -8,33 +8,27 @@ import $ from 'jquery'
 import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
 
+import MainMenu from '../Menu'
 import Status from './components/Status'
 import SpeciesTable from './components/Species'
 import SpeciesCounter from './components/SpeciesPokemonCounter'
 import CheckCounter from './components/CheckCounter'
 
 import confirmDialog from '../ConfirmationDialog'
-import { updateStatus } from '../../actions'
 import {
-  Immutable,
-  Organize
-} from '../../utils'
+  updateStatus,
+  logout,
+  getTrainerPokemon,
+  updateSpecies,
+  updateMonster,
+  updateMonsterSort,
+  evolvePokemon,
+  transferPokemon,
+} from '../../actions'
 
 window.$ = window.jQuery = $
 require('bootstrap')
 
-const COLUMN_SORT_AS_NUM = {
-  nickname: false,
-  iv: true,
-  cp: true,
-  favorite: true,
-  pokemon_id: true,
-  name: false,
-  count: true,
-  candy: true,
-  evolves: true
-}
-
 let running = false
 
 // Helper Methods
@@ -51,10 +45,10 @@ function randomDelay(min, max) {
   return Math.round((min + Math.random() * (max - min)) * 1000)
 }
 
-function setBackgroundImage(team) {
-  const navbar = document.getElementById('navbar')
+function getHeaderBackgroundStyles(team) {
   let teamName = null
   let teamColor = null
+
   switch (team) {
     case 1:
       teamName = 'mystic'
@@ -71,87 +65,74 @@ function setBackgroundImage(team) {
     default:
   }
 
-  navbar.style.backgroundColor = teamColor
-  navbar.style.backgroundImage = `url("./imgs/${teamName}.jpg")`
-  navbar.style.backgroundRepeat = 'no-repeat'
+  return {
+    backgroundColor: teamColor,
+    backgroundImage: `url("./imgs/${teamName}.jpg")`,
+    backgroundRepeat: 'no-repeat'
+  }
 }
 
 const Table = React.createClass({
 
   propTypes: {
-    updateStatus: PropTypes.func.isRequired
-  },
-
-  childContextTypes: {
-    monsterUpdater: PropTypes.func.isRequired
-  },
-
-  getInitialState() {
-    const monsters = ipcRenderer.sendSync('get-players-pokemons')
-    const sortBy = 'pokemon_id'
-    const sortDir = 'ASC'
-
-    return {
-      monsters: this.getNewMonsters(monsters, sortBy, sortDir),
-      filterBy: '',
-      sortBy,
-      sortDir
-    }
-  },
-
-  getChildContext() {
-    return {
-      monsterUpdater: this.updateMonster
-    }
+    updateStatus: PropTypes.func.isRequired,
+    logout: PropTypes.func.isRequired,
+    trainerData: PropTypes.object,
+    getTrainerPokemon: PropTypes.func.isRequired,
+    monsters: PropTypes.object,
+    updateSpecies: PropTypes.func.isRequired,
+    updateMonster: PropTypes.func.isRequired,
+    updateMonsterSort: PropTypes.func.isRequired,
+    speciesState: PropTypes.object,
+    filterBy: PropTypes.string,
+    sortBy: PropTypes.string,
+    sortDir: PropTypes.string,
+    transferPokemon: PropTypes.func.isRequired,
+    evolvePokemon: PropTypes.func.isRequired,
   },
 
   componentDidMount() {
     document.title = 'PokéNurse • Home'
 
-    ipcRenderer.on('receive-players-pokemons', (event, data) => {
-      this.setState({ monsters: this.getNewMonsters(data, this.state.sortBy, this.state.sortDir) })
-    })
-
-    const usernameH = document.getElementById('username-h')
-
-    const playerInfo = ipcRenderer.sendSync('get-player-info')
-    if (playerInfo.success) {
-      setBackgroundImage(playerInfo.player_data.team)
-
-      usernameH.innerHTML = playerInfo.player_data.username
-    } else {
-      ipcRenderer.send('error-message', 'Failed in retrieving player info.  Please restart.')
-    }
-
     ipcRenderer.send('table-did-mount')
-
-    ipcRenderer.on('transfer-pokemon-complete', this.handleTransferCompleted)
-    ipcRenderer.on('evolve-pokemon-complete', this.handleEvolveCompleted)
-  },
-
-  componentWillUnmount() {
-    ipcRenderer.removeListener('transfer-pokemon-complete', this.handleTransferCompleted)
-    ipcRenderer.removeListener('evolve-pokemon-complete', this.handleEvolveCompleted)
   },
 
   render() {
     // <!--<h5 id="pokestorage-h"></h5>
     // <h5 id="bagstorage-h"></h5>-->
     const {
-      monsters,
       filterBy,
       sortBy,
       sortDir
-    } = this.state
+    } = this.props
+
+    const {
+      trainerData,
+      monsters
+    } = this.props
+
+    const username = trainerData ? trainerData.username : ''
+    const backgroundHeaderStyles = trainerData ? getHeaderBackgroundStyles(trainerData.team) : {}
+
+    // TODO let parts of the screen render without monsters
+    if (!monsters) return null
 
     return (
       <div>
         <div className="container">
-          <nav className="navbar navbar-inverse navbar-fixed-top" id="navbar">
+          <nav
+            className="navbar navbar-inverse navbar-fixed-top"
+            style={backgroundHeaderStyles}
+          >
+            <div className="navbar-header">
+              <MainMenu />
+            </div>
             <div className="navbar-header username">
               {' '}
               <strong>
-                <span id="username-h" />
+                <span id="username-h">
+                  {username}
+                </span>
               </strong>
             </div>
             <div className="navbar-right">
@@ -159,7 +140,7 @@ const Table = React.createClass({
                 <SpeciesCounter monsters={monsters} />
                 {' | '}
                 <span>
-                  <CheckCounter ref={(c) => { this.checkCounter = c }} />
+                  <CheckCounter />
                 </span>
               </div>
             </div>
@@ -191,13 +172,6 @@ const Table = React.createClass({
             />
 
             <span className="pull-right">
-              <input
-                type="button"
-                className="btn btn-primary"
-                value="Toggle Caught Species"
-                onClick={this.handleToggleShowAllSpecies}
-              />
-              {" "}
               <input
                 type="button"
                 className="btn btn-warning"
@@ -217,15 +191,9 @@ const Table = React.createClass({
           </h1>
 
           <SpeciesTable
-            ref={(c) => { this.speciesTable = c }}
-            monsters={monsters}
             filterBy={filterBy}
             sortBy={sortBy}
             sortDir={sortDir}
-            sortSpeciesBy={this.sortSpeciesBy}
-            updateSpecies={this.updateSpecies}
-            getSortedPokemon={this.getSortedPokemon}
-            updateCheckedCount={this.updateCheckedCount}
           />
         </div>
 
@@ -244,61 +212,59 @@ const Table = React.createClass({
           tabIndex="-1"
           role="dialog"
           aria-labelledby="detailModalLabel"
-          ref={(c) => { this.detailModal = c }}
+        />
+
+        <div
+          className="modal fade"
+          id="settingsModal"
+          tabIndex="-1"
+          role="dialog"
+          aria-labelledby="settingsModalLabel"
         />
       </div>
     )
   },
 
-  updateCheckedCount(count) {
-    this.checkCounter.handleRecount(count)
-  },
-
   updateMonster(pokemon, options = {}) {
-    const speciesIndex = pokemon.pokemon_id - 1
-
-    const updatedPokemon = options.remove ? null : pokemon
-
-    this.updateSpecies(speciesIndex, (speciesAtIndex) => {
-      const index = speciesAtIndex.pokemon.findIndex((p) => p.id === pokemon.id)
-
-      const sorted = this.getSortedPokemon(Object.assign({}, speciesAtIndex, {
-        pokemon: Immutable.array.set(speciesAtIndex.pokemon, index, updatedPokemon)
-      }))
-
-      return { // make sure we sort the new pokemon index now that we updated it
-        pokemon: sorted
-      }
-    })
+    this.props.updateMonster({ pokemon, options })
   },
 
   updateSpecies(index, updater) {
-    const speciesAtIndex = this.state.monsters.species[index]
-    const updatedSpecies = Object.assign({}, speciesAtIndex, updater(speciesAtIndex))
-
-    const updatedMonsters = Object.assign({}, this.state.monsters, {
-      species: Immutable.array.set(this.state.monsters.species, index, updatedSpecies)
-    })
-
-    this.setState({
-      monsters: updatedMonsters
-    })
+    this.props.updateSpecies({ index, updater })
   },
 
   onFilterChange(event) {
-    this.setState({
+    this.props.updateMonsterSort({
       filterBy: String(event.target.value).toLowerCase()
     })
   },
 
   handleRefresh() {
-    ipcRenderer.send('get-players-pokemons', 'async')
+    this.props.getTrainerPokemon()
+  },
+
+  getPokemonChecked() {
+    const {
+      monsters,
+      speciesState
+    } = this.props
+    const checkedPokemon = []
+
+    monsters.species.forEach((specie) => {
+      specie.pokemon.forEach((p) => {
+        if (speciesState[specie.pokemon_id].pokemonState[p.id].check) {
+          checkedPokemon.push(p)
+        }
+      })
+    })
+
+    return checkedPokemon
   },
 
   handleTransfer() {
     if (runningCheck()) return
 
-    const selectedPokemon = this.speciesTable.getPokemonChecked()
+    const selectedPokemon = this.getPokemonChecked()
     if (selectedPokemon.length < 1) return
 
     confirmDialog($(this.confirmationDialog), {
@@ -308,15 +274,22 @@ const Table = React.createClass({
       pokemon: selectedPokemon,
       secondaryText: 'Transfer All',
       onClickSecondary: () => {
+        if (runningCheck()) return
+
         this.handleCountDown(selectedPokemon, 'Transfer', selectedPokemon.length * 2.5)
 
         selectedPokemon.forEach((pokemon, index) => {
-          ipcRenderer.send('transfer-pokemon', pokemon, index * randomDelay(2, 3))
+          this.props.transferPokemon(pokemon, index * randomDelay(2, 3))
+            .then(() => {
+              this.handleTransferCompleted(pokemon)
+            })
         })
       },
 
       primaryText: 'Transfer without favorites',
       onClickPrimary: () => {
+        if (runningCheck()) return
+
         const filteredPokemon = selectedPokemon.filter((p) => {
           const isntFavorite = !p.favorite ? -1 : 0 // TODO stop this -1/0 garbage
 
@@ -326,7 +299,10 @@ const Table = React.createClass({
         this.handleCountDown(filteredPokemon, 'Transfer', filteredPokemon.length * 2.5)
 
         filteredPokemon.forEach((pokemon, index) => {
-          ipcRenderer.send('transfer-pokemon', pokemon, index * randomDelay(2, 3))
+          this.props.transferPokemon(pokemon, index * randomDelay(2, 3))
+            .then(() => {
+              this.handleTransferCompleted(pokemon)
+            })
         })
       }
     })
@@ -335,7 +311,7 @@ const Table = React.createClass({
   handleEvolve() {
     if (runningCheck()) return
 
-    const selectedPokemon = this.speciesTable.getPokemonChecked()
+    const selectedPokemon = this.getPokemonChecked()
     if (selectedPokemon.length < 1) return
 
     confirmDialog($(this.confirmationDialog), {
@@ -345,10 +321,15 @@ const Table = React.createClass({
       primaryText: 'Evolve Selected',
       onClickSecondary: () => {},
       onClickPrimary: () => {
+        if (runningCheck()) return
+
         this.handleCountDown(selectedPokemon, 'Evolve', selectedPokemon.length * 27.5)
 
         selectedPokemon.forEach((pokemon, index) => {
-          ipcRenderer.send('evolve-pokemon', pokemon, index * randomDelay(25, 30))
+          this.props.evolvePokemon(pokemon, index * randomDelay(25, 30))
+            .then(() => {
+              this.handleEvolveCompleted(pokemon)
+            })
         })
       }
     })
@@ -369,100 +350,36 @@ const Table = React.createClass({
     })
   },
 
-  getSortedSpecies(monsters, sortBy, sortDir) {
-    const species = monsters.species.slice()
-
-    if (COLUMN_SORT_AS_NUM[sortBy]) {
-      Organize.sortAsNumber(species, sortBy, sortDir)
-    } else {
-      Organize.sortAsString(species, sortBy, sortDir)
-    }
-
-    return species
-  },
-
-  getSortedPokemon(specie, sortBy, sortDir) {
-    const pokemon = specie.pokemon.slice()
-
-    if (!sortBy && !sortDir) {
-      // Hacky way of retrieving the current sort state of species.jsx
-      if (this.speciesTable) {
-        const sortState = this.speciesTable.getSortState(specie)
-        sortBy = sortState.sortBy
-        sortDir = sortState.sortDir
-      } else {
-        sortBy = 'cp'
-        sortDir = 'DESC'
-      }
-    }
-
-    if (COLUMN_SORT_AS_NUM[sortBy]) {
-      Organize.sortAsNumber(pokemon, sortBy, sortDir)
-    } else {
-      Organize.sortAsString(pokemon, sortBy, sortDir)
-    }
-
-    return pokemon
-  },
-
-  sortSpeciesBy(newSortBy) {
-    const {
-      sortBy,
-      sortDir
-    } = this.state
-
-    let newSortDir = null
-
-    if (newSortBy === sortBy) {
-      newSortDir = sortDir === 'ASC' ? 'DESC' : 'ASC'
-    } else {
-      newSortDir = 'DESC'
-    }
-
-    const monsters = Object.assign({}, this.state.monsters, {
-      species: this.getSortedSpecies(this.state.monsters, newSortBy, newSortDir)
-    })
-
-    this.setState({
-      sortDir: newSortDir,
-      sortBy: newSortBy,
-      monsters
-    })
-  },
-
-  getNewMonsters(monsters, sortBy, sortDir) {
-    const sortedSpecies = this.getSortedSpecies(monsters, sortBy, sortDir)
-
-    // Mutates, but it is okay because we sliced/sorted above ^
-    sortedSpecies.forEach(specie => {
-      specie.pokemon = this.getSortedPokemon(specie)
-    })
-
-    return Object.assign({}, monsters, {
-      species: sortedSpecies
-    })
-  },
-
   removeMonster(pokemon) {
     this.updateMonster(pokemon, { remove: true })
-    // TODO this happens whether or not we find something to remove
-    // we should only update the count if we successfully remove
-    this.updateCheckedCount(-1)
   },
 
-  handleEvolveCompleted(event, pokemon) {
+  handleEvolveCompleted(pokemon) {
     this.props.updateStatus({ current: pokemon })
     this.removeMonster(pokemon)
   },
 
-  handleTransferCompleted(event, pokemon) {
+  handleTransferCompleted(pokemon) {
     this.props.updateStatus({ current: pokemon })
     this.removeMonster(pokemon)
   },
 
-  handleToggleShowAllSpecies() {
-    this.speciesTable.toggleShowAllSpecies()
-  }
 })
 
-export default connect(null, (dispatch => bindActionCreators({ updateStatus }, dispatch)))(Table)
+export default connect((state => ({
+  trainerData: state.trainer.trainerData,
+  monsters: state.trainer.monsters,
+  speciesState: state.trainer.speciesState,
+  sortBy: state.trainer.sortBy,
+  sortDir: state.trainer.sortDir,
+  filterBy: state.trainer.filterBy,
+})), (dispatch => bindActionCreators({
+  updateStatus,
+  logout,
+  getTrainerPokemon,
+  updateSpecies,
+  updateMonster,
+  updateMonsterSort,
+  evolvePokemon,
+  transferPokemon,
+}, dispatch)))(Table)
diff --git a/app/store/configureStore.development.js b/app/store/configureStore.development.js
index adb4365..e33d9d5 100644
--- a/app/store/configureStore.development.js
+++ b/app/store/configureStore.development.js
@@ -3,7 +3,7 @@ import {
   applyMiddleware,
   compose
 } from 'redux'
-// import thunk from 'redux-thunk'
+import thunk from 'redux-thunk'
 import createLogger from 'redux-logger'
 import rootReducer from '../reducers'
 import actionCreators from '../actions'
@@ -15,7 +15,7 @@ const logger = createLogger({
 
 
 const enhancer = compose(
-  applyMiddleware(logger),
+  applyMiddleware(thunk, logger),
   window.devToolsExtension ?
     window.devToolsExtension({ actionCreators }) :
     noop => noop
diff --git a/app/store/configureStore.production.js b/app/store/configureStore.production.js
index 98115aa..f5ef955 100644
--- a/app/store/configureStore.production.js
+++ b/app/store/configureStore.production.js
@@ -1,6 +1,9 @@
-import { createStore } from 'redux'
+import { createStore, applyMiddleware } from 'redux'
+import thunk from 'redux-thunk'
 import rootReducer from '../reducers'
 
+const enhancer = applyMiddleware(thunk)
+
 export default function configureStore(initialState) {
-  return createStore(rootReducer, initialState)
+  return createStore(rootReducer, initialState, enhancer)
 }
diff --git a/app/store/index.js b/app/store/index.js
index b84566c..d7be4a1 100644
--- a/app/store/index.js
+++ b/app/store/index.js
@@ -1,23 +1,3 @@
-// import {
-//   compose,
-//   applyMiddleware,
-//   createStore
-// } from 'redux'
-// import createLogger from 'redux-logger'
-//
-// import reducer from './reducers'
-//
-// // Create Logger for logging of actions
-// const logger = createLogger()
-//
-// // http://redux.js.org/docs/api/compose.html
-// const storeEnhancer = compose(applyMiddleware(logger))
-//
-//
-// function configureStore(initialState) {
-//   return createStore(reducer, initialState, storeEnhancer)
-// }
-
 import configureStore from './configureStore'
 
 const initialState = {}
diff --git a/app/utils.js b/app/utils.js
index e5608de..55e5b35 100644
--- a/app/utils.js
+++ b/app/utils.js
@@ -1,3 +1,335 @@
+import {
+  times
+} from 'lodash'
+
+import baseStats from '../baseStats'
+
+import {
+  defaultSettings
+} from './reducers/settings'
+
+const levelCpMultiplier = {
+  1: 0.094,
+  1.5: 0.135137432,
+  2: 0.16639787,
+  2.5: 0.192650919,
+  3: 0.21573247,
+  3.5: 0.236572661,
+  4: 0.25572005,
+  4.5: 0.273530381,
+  5: 0.29024988,
+  5.5: 0.306057377,
+  6: 0.3210876,
+  6.5: 0.335445036,
+  7: 0.34921268,
+  7.5: 0.362457751,
+  8: 0.37523559,
+  8.5: 0.387592406,
+  9: 0.39956728,
+  9.5: 0.411193551,
+  10: 0.42250001,
+  10.5: 0.432926419,
+  11: 0.44310755,
+  11.5: 0.453059958,
+  12: 0.46279839,
+  12.5: 0.472336083,
+  13: 0.48168495,
+  13.5: 0.4908558,
+  14: 0.49985844,
+  14.5: 0.508701765,
+  15: 0.51739395,
+  15.5: 0.525942511,
+  16: 0.53435433,
+  16.5: 0.542635767,
+  17: 0.55079269,
+  17.5: 0.558830576,
+  18: 0.56675452,
+  18.5: 0.574569153,
+  19: 0.58227891,
+  19.5: 0.589887917,
+  20: 0.59740001,
+  20.5: 0.604818814,
+  21: 0.61215729,
+  21.5: 0.619399365,
+  22: 0.62656713,
+  22.5: 0.633644533,
+  23: 0.64065295,
+  23.5: 0.647576426,
+  24: 0.65443563,
+  24.5: 0.661214806,
+  25: 0.667934,
+  25.5: 0.674577537,
+  26: 0.68116492,
+  26.5: 0.687680648,
+  27: 0.69414365,
+  27.5: 0.700538673,
+  28: 0.70688421,
+  28.5: 0.713164996,
+  29: 0.71939909,
+  29.5: 0.725571552,
+  30: 0.7317,
+  30.5: 0.734741009,
+  31: 0.73776948,
+  31.5: 0.740785574,
+  32: 0.74378943,
+  32.5: 0.746781211,
+  33: 0.74976104,
+  33.5: 0.752729087,
+  34: 0.75568551,
+  34.5: 0.758630378,
+  35: 0.76156384,
+  35.5: 0.764486065,
+  36: 0.76739717,
+  36.5: 0.770297266,
+  37: 0.7731865,
+  37.5: 0.776064962,
+  38: 0.77893275,
+  38.5: 0.781790055,
+  39: 0.78463697,
+  39.5: 0.787473578,
+  40: 0.79030001,
+  40.5: 0.7931164
+}
+
+function getLevel(cpMultiplier) {
+  let level
+
+  if (cpMultiplier < 0.734) {
+    // compute polynomial approximation obtained by regression
+    level = 58.35178527 * cpMultiplier * cpMultiplier - 2.838007664 * cpMultiplier + 0.8539209906
+  } else {
+    // compute linear approximation obtained by regression
+    level = 171.0112688 * cpMultiplier - 95.20425243
+  }
+
+  // round to nearest .5 value and return
+  return Math.round((level) * 2) / 2.0
+}
+
+function getMaxCostsForPowerup(
+  trainerLevel,
+  powerups,
+  pokemonsCPMultiplier,
+  transform,
+  upgradesPerLevel = 2,
+  allowedLevelsAbovePlayer = 2
+) {
+  // The Maximum Level this pokemon can reach
+  const maxLevelOfPokemon = trainerLevel + allowedLevelsAbovePlayer
+  // The current level of the pokemon based on its `cp_multiplier` property
+  const currentLevelOfPokemon = utils.getLevelFromCpMultiplier(pokemonsCPMultiplier)
+
+  // Number of Upgrades to Maximum
+  // So if your current level was 3 and if it could max at 20,
+  // that would be 17 Upgrades * 2 Upl - 1 = 33 Upgrades
+  const numberOfUpgrades = ((maxLevelOfPokemon - currentLevelOfPokemon) * upgradesPerLevel) - 1
+
+  // initialize our total cost for candies or dust
+  let total = transform(levelCpMultiplier[currentLevelOfPokemon], powerups)
+  let currentPowerUps = powerups + 1
+
+  // The difference between any two adjacent levels +-
+  const levelSize = 0.5
+
+  times(numberOfUpgrades, (i) => {
+    // The number that represents the current upgrade
+    const upgradeNumber = i + 1
+    // The level the pokemon will become if upgraded
+    // currentLevelOfPokemon could be 3, if the index is 0, upgradeNumber is 1
+    // so we get (1 * .5) + 3
+    const level = (upgradeNumber * levelSize) + currentLevelOfPokemon
+    // the number of power ups previously applied and the number we are applying
+    // so if you used 4, the first index is 0 so 4
+    currentPowerUps += i
+
+    // a candy or dust cost calculated from
+    // a levels cp multiplier and the current number of power ups used
+    total += transform(levelCpMultiplier[level], currentPowerUps)
+  })
+
+  return total
+}
+
+const utils = {
+  levelCpMultiplier,
+
+  getLevelFromCpMultiplier(multiplier) {
+    return getLevel(multiplier)
+  },
+
+  getMaxCp(attack, defense, stamina) {
+    return utils.getMaxCpForTrainerLevel(attack, defense, stamina, 40)
+  },
+
+  getMaxCpForTrainerLevel(attack, defense, stamina, trainerLevel) {
+    const maxPokemonLevel = Math.min(40.5, trainerLevel + 1.5)
+    const maxCpMultiplier = levelCpMultiplier[maxPokemonLevel]
+    const ADS = attack * Math.pow(defense, 0.5) * Math.pow(stamina, 0.5)
+    const total = ADS * Math.pow(maxCpMultiplier, 2.0)
+    return Math.floor(total / 10)
+  },
+
+  getStardustCostsForPowerup(cpMultiplier, powerups) {
+    const level = utils.getLevelFromCpMultiplier(cpMultiplier)
+
+    if (level <= 2.5 && powerups <= 5) {
+      return 200
+    }
+    if (level <= 4.5 && powerups <= 9) {
+      return 400
+    }
+    if (level <= 6.5 && powerups <= 13) {
+      return 600
+    }
+    if (level <= 8.5 && powerups <= 17) {
+      return 800
+    }
+    if (level <= 10.5 && powerups <= 21) {
+      return 1000
+    }
+    if (level <= 12.5 && powerups <= 25) {
+      return 1300
+    }
+    if (level <= 14.5 && powerups <= 29) {
+      return 1600
+    }
+    if (level <= 16.5 && powerups <= 33) {
+      return 1900
+    }
+    if (level <= 18.5 && powerups <= 37) {
+      return 2200
+    }
+    if (level <= 20.5 && powerups <= 41) {
+      return 2500
+    }
+    if (level <= 22.5 && powerups <= 45) {
+      return 3000
+    }
+    if (level <= 24.5 && powerups <= 49) {
+      return 3500
+    }
+    if (level <= 26.5 && powerups <= 53) {
+      return 4000
+    }
+    if (level <= 28.5 && powerups <= 57) {
+      return 4500
+    }
+    if (level <= 30.5 && powerups <= 61) {
+      return 5000
+    }
+    if (level <= 32.5 && powerups <= 65) {
+      return 6000
+    }
+    if (level <= 34.5 && powerups <= 69) {
+      return 7000
+    }
+    if (level <= 36.5 && powerups <= 73) {
+      return 8000
+    }
+    if (level <= 38.5 && powerups <= 77) {
+      return 9000
+    }
+    return 10000
+  },
+
+  getCandyCostsForPowerup(cpMultiplier, powerups) {
+    const level = utils.getLevelFromCpMultiplier(cpMultiplier)
+
+    if (level <= 10.5 && powerups <= 21) {
+      return 1
+    }
+    if (level <= 20.5 && powerups <= 41) {
+      return 2
+    }
+    if (level <= 25.5 && powerups <= 51) {
+      return 3
+    }
+    if (level <= 30.5 && powerups <= 61) {
+      return 4
+    }
+    if (level <= 32.5 && powerups <= 65) {
+      return 6
+    }
+    if (level <= 34.5 && powerups <= 69) {
+      return 8
+    }
+    if (level <= 36.5 && powerups <= 73) {
+      return 10
+    }
+    if (level <= 38.5 && powerups <= 77) {
+      return 12
+    }
+    return 15
+  },
+
+  getCpAfterPowerup(cp, cpMultiplier) {
+    const level = utils.getLevelFromCpMultiplier(cpMultiplier)
+
+    if (level <= 10) {
+      return (cp * 0.009426125469) / Math.pow(cpMultiplier, 2)
+    }
+    if (level <= 20) {
+      return (cp * 0.008919025675) / Math.pow(cpMultiplier, 2)
+    }
+    if (level <= 30) {
+      return (cp * 0.008924905903) / Math.pow(cpMultiplier, 2)
+    }
+    return (cp * 0.00445946079) / Math.pow(cpMultiplier, 2)
+  },
+
+  getMaxCandyCostsForPowerup(
+    trainerLevel,
+    powerups,
+    pokemonsCPMultiplier,
+    upgradesPerLevel,
+    allowedLevelsAbovePlayer
+  ) {
+    return getMaxCostsForPowerup(
+      trainerLevel,
+      powerups,
+      pokemonsCPMultiplier,
+      utils.getCandyCostsForPowerup,
+      upgradesPerLevel,
+      allowedLevelsAbovePlayer
+    )
+  },
+
+  getMaxStardustCostsForPowerup(
+    trainerLevel,
+    powerups,
+    pokemonsCPMultiplier,
+    upgradesPerLevel,
+    allowedLevelsAbovePlayer
+  ) {
+    return getMaxCostsForPowerup(
+      trainerLevel,
+      powerups,
+      pokemonsCPMultiplier,
+      utils.getStardustCostsForPowerup,
+      upgradesPerLevel,
+      allowedLevelsAbovePlayer
+  )
+  },
+
+  getADS(pokemon) {
+    return pokemon.individual_attack + pokemon.individual_defense + pokemon.individual_stamina
+  },
+
+  getIVs(pokemon) {
+    return Math.round(utils.getADS(pokemon) / 45 * 10000) / 100
+  },
+
+  getEvolvesCount({ candy, count, pokemon_id }) {
+    let evolves = Math.floor(candy / baseStats.pokemon[pokemon_id].evolveCost)
+
+    if ((evolves === Infinity || isNaN(evolves))) {
+      evolves = 0
+    }
+
+    return (evolves > count ? count : evolves)
+  }
+}
+
 const Immutable = {
   array: {
     set(array, index, item) {
@@ -17,6 +349,18 @@ const Immutable = {
   }
 }
 
+const COLUMN_SORT_AS_NUM = {
+  nickname: false,
+  iv: true,
+  cp: true,
+  favorite: true,
+  pokemon_id: true,
+  name: false,
+  count: true,
+  candy: true,
+  evolves: true
+}
+
 const Organize = {
   sortAsString(array, sortBy, sortDir) {
     array.sort((a, b) => {
@@ -38,7 +382,42 @@ const Organize = {
 
       return b[sortBy] - a[sortBy]
     })
-  }
+  },
+
+  getSortedPokemon(specie, currentSortState, sortBy, sortDir) {
+    const pokemon = specie.pokemon.slice()
+
+    if (!sortBy && !sortDir) {
+      // Hacky way of retrieving the current sort state of species.jsx
+      if (currentSortState) {
+        sortBy = currentSortState.sortBy
+        sortDir = currentSortState.sortDir
+      } else {
+        sortBy = defaultSettings.defaultSpecieSortBy
+        sortDir = defaultSettings.defaultSpecieSortDirection
+      }
+    }
+
+    if (COLUMN_SORT_AS_NUM[sortBy]) {
+      Organize.sortAsNumber(pokemon, sortBy, sortDir)
+    } else {
+      Organize.sortAsString(pokemon, sortBy, sortDir)
+    }
+
+    return pokemon
+  },
+
+  getSortedSpecies(monsters, sortBy, sortDir) {
+    const species = monsters.species.slice()
+
+    if (COLUMN_SORT_AS_NUM[sortBy]) {
+      Organize.sortAsNumber(species, sortBy, sortDir)
+    } else {
+      Organize.sortAsString(species, sortBy, sortDir)
+    }
+
+    return species
+  },
 }
 
-export { Immutable, Organize }
+export { utils as default, Immutable, Organize, COLUMN_SORT_AS_NUM }
diff --git a/main.development.js b/main.development.js
index 94c8cf7..2e2cfa9 100644
--- a/main.development.js
+++ b/main.development.js
@@ -1,9 +1,3 @@
-/* eslint no-console: 0 */
-
-import fs from 'fs'
-import path from 'path'
-import pogobuf from 'pogobuf'
-import POGOProtos from 'node-pogo-protos'
 import {
   app,
   BrowserWindow,
@@ -11,27 +5,20 @@ import {
   dialog,
   Menu
 } from 'electron'
-import times from 'lodash/times'
-import keyBy from 'lodash/keyBy'
-
-import menuTemplate from './main/main_menu'
-import utils from './main/utils'
-import baseStats from './baseStats'
 
-const accountPath = path.join(app.getPath('appData'), '/pokenurse/account.json')
+import menuTemplate from './main/mainMenu'
+import checkForUpdates from './main/checkForUpdates'
 
-const kantoDexCount = 151
+const isOSX = process.platform === 'darwin'
+const isDevelopment = process.env.NODE_ENV === 'development'
 
 let mainWindow = null
-let client = null
 
-if (process.env.NODE_ENV === 'development') {
-  require('electron-debug')() // eslint-disable-line global-require
-}
+if (isDevelopment) require('electron-debug')() // eslint-disable-line global-require
 
-function sleep(time) {
-  return new Promise(r => setTimeout(r, time))
-}
+process.on('uncaughtException', (error) => {
+  console.error('uncaughtException', error) // eslint-disable-line
+})
 
 function createWindow() {
   mainWindow = new BrowserWindow({
@@ -57,16 +44,39 @@ function createWindow() {
     e.preventDefault()
   })
 
+  // If for some reason the app crashes we can get some information about it
+  mainWindow.webContents.on('crashed', (event) => {
+    console.error('crashed', event) // eslint-disable-line
+  })
+
   // allow garbage collection to occur on win when closed
   mainWindow.on('closed', () => {
     mainWindow = null
   })
 
+  mainWindow.on('unresponsive', (event) => {
+    console.error('unresponsive', event) // eslint-disable-line
+  })
+
+
+  //
+  // OS X Specific Configuration
+  //
+  if (isOSX) {
+    // Hide the window on close rather than quitting the app,
+    // and make sure to really close the window when quitting.
+    mainWindow.on('close', (event) => {
+      if (mainWindow.forceClose) return
+      event.preventDefault()
+      mainWindow.hide()
+    })
+  }
+
   // Create/set the main menu
   const menu = Menu.buildFromTemplate(menuTemplate)
   Menu.setApplicationMenu(menu)
 
-  if (process.env.NODE_ENV === 'development') {
+  if (isDevelopment) {
     mainWindow.openDevTools()
     mainWindow.webContents.on('context-menu', (e, props) => {
       const { x, y } = props
@@ -80,23 +90,32 @@ function createWindow() {
     })
   }
 
-  client = new pogobuf.Client()
+  checkForUpdates({ displayNoUpdateAvailable: false })
+}
+
+//
+// OS X Specific Configuration
+//
+if (isOSX) {
+  // Hide the window on close rather than quitting the app,
+  // and make sure to really close the window when quitting.
+  app.on('before-quit', () => {
+    mainWindow.forceClose = true
+  })
+
+  app.on('activate', () => {
+    mainWindow.show()
+  })
 }
 
 app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
+  if (!isOSX) {
     app.quit()
   }
 })
 
-// app.on('activate', () => {
-//   if (mainWindow === null) {
-//     createWindow()
-//   }
-// })
-
 const installExtensions = async () => {
-  if (process.env.NODE_ENV === 'development') {
+  if (isDevelopment) {
     const installer = require('electron-devtools-installer') // eslint-disable-line global-require
 
     const extensions = [
@@ -155,7 +174,7 @@ ipcMain.on('confirmation-dialog', (event, method) => {
     message: `Are you sure you want to ${method} the selected Pokemon?`
   }, response => {
     if (response === 1) {
-      console.log(`[!] ${method} cancelled`)
+      console.log(`[!] ${method} cancelled`) // eslint-disable-line
       event.returnValue = {
         success: false
       }
@@ -169,314 +188,6 @@ ipcMain.on('confirmation-dialog', (event, method) => {
 })
 // END OF GENERAL
 
-// LOGIN
-ipcMain.on('get-account-credentials', (event) => {
-  console.log(`[+] Attempting to retrieve saved account credentials from ${accountPath}`)
-
-  let credentials = {}
-
-  if (!fs.existsSync(accountPath)) {
-    console.log("[!] account.json doesn't exist")
-    event.returnValue = {
-      success: false
-    }
-    return
-  }
-
-  // Maybe use readFile instead
-  credentials = JSON.parse(fs.readFileSync(accountPath))
-
-  console.log('[+] Retrieved saved account')
-
-  event.returnValue = {
-    success: true,
-    method: credentials.method,
-    username: credentials.username,
-    password: credentials.password
-  }
-})
-
-ipcMain.on('save-account-credentials', (event, method, username, password) => {
-  console.log('[+] Saving account credentials')
-
-  const credentials = JSON.stringify({
-    method,
-    username,
-    password
-  })
-
-  fs.writeFile(accountPath, credentials, (err) => {
-    if (err) console.log(err)
-    console.log(`[+] Saved account credentials to ${accountPath}`)
-  })
-})
-
-ipcMain.on('check-and-delete-credentials', () => {
-  if (fs.existsSync(accountPath)) {
-    fs.unlink(accountPath, (err) => {
-      if (err) console.log(err)
-      console.log(`[+] Deleted account credentials, located at ${accountPath}`)
-    })
-  }
-})
-
-ipcMain.on('pokemon-login', async (event, method, username, password) => {
-  console.log('[+] Attempting to login')
-  let login
-  if (method === 'google') {
-    login = new pogobuf.GoogleLogin()
-  } else {
-    login = new pogobuf.PTCLogin()
-  }
-
-  try {
-    const token = await login.login(username, password)
-
-    client.setAuthInfo(method, token)
-    client.init()
-
-    event.sender.send('pokemon-logged-in')
-  } catch (error) {
-    console.error(error)
-    showErrorMessage(error.message)
-  }
-})
-// END OF LOGIN
-
 ipcMain.on('table-did-mount', () => {
   mainWindow.setSize(900, 600, true)
 })
-
-// POKEMON
-ipcMain.on('get-player-info', async (event) => {
-  console.log('[+] Retrieving player info')
-
-  try {
-    const response = await client.getPlayer()
-
-    if (!response.success) {
-      event.returnValue = {
-        success: false
-      }
-      return
-    }
-
-    event.returnValue = {
-      success: 'true',
-      player_data: response.player_data
-    }
-  } catch (error) {
-    console.error(error)
-  }
-})
-
-function generateEmptySpecies(candies) {
-  const candiesByFamilyId = keyBy(candies, (candy) => String(candy.family_id))
-
-  return times(kantoDexCount, (i) => {
-    const pokemonDexNumber = String(i + 1)
-    const basePokemon = baseStats.pokemon[pokemonDexNumber]
-
-    const candyByFamilyId = candiesByFamilyId[basePokemon.familyId]
-    const candy = candyByFamilyId ? candyByFamilyId.candy : 0
-
-    return {
-      candy,
-      pokemon_id: pokemonDexNumber,
-      name: basePokemon.name,
-      count: 0,
-      evolves: 0,
-      pokemon: []
-    }
-  })
-}
-
-function parseInventory(inventory) {
-  const { player, candies, pokemon } = pogobuf.Utils.splitInventory(inventory)
-
-  const speciesList = generateEmptySpecies(candies)
-  const eggList = []
-
-  // populates the speciesList with pokemon and counts
-  // populates the eggList with pokemon
-  pokemon.forEach(p => {
-    if (p.is_egg) {
-      eggList.push(p)
-      return
-    }
-
-    let pokemonName = pogobuf.Utils.getEnumKeyByValue(
-      POGOProtos.Enums.PokemonId,
-      p.pokemon_id
-    )
-
-    pokemonName = pokemonName.replace('Female', '♀').replace('Male', '♂')
-
-    const stats = baseStats.pokemon[p.pokemon_id]
-
-    const totalCpMultiplier = p.cp_multiplier + p.additional_cp_multiplier
-
-    const attack = stats.BaseAttack + p.individual_attack
-    const defense = stats.BaseDefense + p.individual_defense
-    const stamina = stats.BaseStamina + p.individual_stamina
-
-    const maxCP = utils.getMaxCpForTrainerLevel(attack, defense, stamina, player.level)
-    const candyCost = utils.getCandyCostsForPowerup(totalCpMultiplier, p.num_upgrades)
-    const stardustCost = utils.getStardustCostsForPowerup(totalCpMultiplier, p.num_upgrades)
-    const candyMaxCost = utils.getMaxCandyCostsForPowerup(
-      player.level,
-      p.num_upgrades,
-      totalCpMultiplier
-    )
-
-    const stardustMaxCost = utils.getMaxStardustCostsForPowerup(
-      player.level,
-      p.num_upgrades,
-      totalCpMultiplier
-    )
-
-    const nextCP = utils.getCpAfterPowerup(p.cp, totalCpMultiplier)
-
-    const iv = utils.getIVs(p)
-
-    // TODO Use CamelCase instead of under_score for all keys except responses
-    const pokemonWithStats = {
-      iv,
-      cp: p.cp,
-      next_cp: nextCP,
-      max_cp: maxCP,
-      candy_cost: candyCost,
-      candy_max_cost: candyMaxCost,
-      stardust_cost: stardustCost,
-      stardust_max_cost: stardustMaxCost,
-      creation_time_ms: p.creation_time_ms.toString(),
-      deployed: p.deployed_fort_id !== '',
-      id: p.id.toString(),
-      attack: p.individual_attack,
-      defense: p.individual_defense,
-      stamina: p.individual_stamina,
-      current_stamina: p.stamina,
-      stamina_max: p.stamina_max,
-      pokemon_id: p.pokemon_id,
-      name: pokemonName,
-      height: p.height_m,
-      weight: p.weight_kg,
-      nickname: p.nickname || pokemonName,
-      // Multiply by -1 for sorting
-      favorite: p.favorite * -1,
-      move_1: p.move_1,
-      move_2: p.move_2
-    }
-
-    const speciesIndex = p.pokemon_id - 1
-
-    speciesList[speciesIndex].count += 1
-    speciesList[speciesIndex].pokemon.push(pokemonWithStats)
-  })
-
-  // TODO use map
-  speciesList.forEach((s) => {
-    s.evolves = utils.getEvolvesCount(s)
-  })
-
-  return {
-    success: true,
-    species: speciesList,
-    eggs: eggList
-  }
-}
-
-async function getPlayersPokemons(event, sync = 'sync') {
-  try {
-    const inventory = await client.getInventory(0)
-
-    if (!inventory.success) {
-      const payload = { success: false }
-      if (sync !== 'sync') {
-        event.sender.send('receive-players-pokemons', payload)
-        return
-      }
-      event.returnValue = payload
-      return
-    }
-
-    const payload = parseInventory(inventory)
-
-    if (sync === 'sync') {
-      event.returnValue = payload
-    } else {
-      event.sender.send('receive-players-pokemons', payload)
-    }
-  } catch (error) {
-    console.error(error)
-  }
-}
-
-ipcMain.on('get-players-pokemons', (event, sync) => {
-  console.log("[+] Retrieving player's Pokemons and Calculating Evolves")
-  getPlayersPokemons(event, sync)
-})
-
-ipcMain.on('power-up-pokemon', async (event, id, nickname) => {
-  try {
-    await client.upgradePokemon(id)
-
-    console.log(`[+] Upgraded Pokemon with id: ${id}`)
-    const message = `Upgraded ${nickname} succesfully!`
-    const title = `Power Up ${nickname}`
-    // TODO parse the response instead of retrieving all the new pokemon
-    // Requires replacing the main parsing with more functional code
-    getPlayersPokemons(event, 'async')
-    showInformationMessage(message, title)
-  } catch (error) {
-    console.error(error)
-  }
-})
-
-ipcMain.on('transfer-pokemon', async (event, pokemon, delay) => {
-  try {
-    await sleep(delay)
-    await client.releasePokemon(pokemon.id)
-    console.log(`[+] Released Pokemon with id: ${pokemon.id}`)
-
-    event.sender.send('transfer-pokemon-complete', pokemon)
-  } catch (error) {
-    console.error(error)
-  }
-})
-
-ipcMain.on('evolve-pokemon', async (event, pokemon, delay) => {
-  try {
-    await sleep(delay)
-    await client.evolvePokemon(pokemon.id)
-    console.log(`[+] Evolved Pokemon with id: ${pokemon.id}`)
-
-    event.sender.send('evolve-pokemon-complete', pokemon)
-  } catch (error) {
-    console.error(error)
-  }
-})
-
-ipcMain.on('favorite-pokemon', async (event, id, isFavorite) => {
-  try {
-    await client.setFavoritePokemon(id, isFavorite)
-
-    console.log(`[+] Pokemon favorite status set to ${isFavorite}`)
-    getPlayersPokemons(event, 'async')
-  } catch (error) {
-    console.error(error)
-  }
-})
-
-ipcMain.on('rename-pokemon', async (event, id, nickname) => {
-  try {
-    await client.nicknamePokemon(id, nickname)
-
-    console.log(`[+] Pokemon ${id} nicknamed ${nickname}`)
-
-    event.sender.send('rename-pokemon-complete', id, nickname)
-  } catch (error) {
-    console.error(error)
-  }
-})
-// END OF POKEMON
diff --git a/main/checkForUpdates.js b/main/checkForUpdates.js
new file mode 100644
index 0000000..5c2d109
--- /dev/null
+++ b/main/checkForUpdates.js
@@ -0,0 +1,75 @@
+import https from 'https'
+import {
+  dialog,
+  shell,
+} from 'electron'
+
+import updateAvailable from './updateAvailable'
+
+import packageJSON from '../package.json'
+
+function checkForUpdates(displayNoUpdateAvailable, latestPackageUrl, latestReleasesUrl) {
+  let data = ''
+  const name = packageJSON.name
+  const currentVersion = packageJSON.version
+
+  https.get(latestPackageUrl, (res) => {
+    res.setEncoding('utf8')
+    res.on('data', (chunk) => { data += chunk })
+    res.on('end', () => {
+      let latestVersion = '0.0.0'
+
+      try {
+        latestVersion = JSON.parse(data).version
+      } catch (e) {
+        console.error(e) // eslint-disable-line
+
+        dialog.showMessageBox({
+          type: 'info',
+          buttons: [],
+          title: 'Check for Updates',
+          message: 'Error Checking for Updates',
+          detail: `${name} ran into an error checking for updates. Please try again later.`,
+        })
+        return
+      }
+
+      if (updateAvailable(currentVersion, latestVersion)) {
+        dialog.showMessageBox({
+          type: 'info',
+          buttons: ['OK', 'Open Downloads Page'],
+          title: 'Check for Updates',
+          message: 'Update Available',
+          detail: `You have v${currentVersion} and v${latestVersion} is available for download.`,
+        }, (buttonIndex) => {
+          if (buttonIndex === 1) {
+            shell.openExternal(latestReleasesUrl)
+          }
+        })
+      } else if (displayNoUpdateAvailable) {
+        dialog.showMessageBox({
+          type: 'info',
+          buttons: [],
+          title: 'Check for Updates',
+          message: 'No Update Available',
+          detail: `You have the latest version of ${name}, \nv${currentVersion}`,
+        })
+      }
+    })
+  }).on('error', (e) => {
+    dialog.showMessageBox({
+      type: 'info',
+      buttons: [],
+      title: 'Error',
+      message: 'Error',
+      detail: String(e),
+    })
+  })
+}
+
+export default ({ displayNoUpdateAvailable }) => {
+  checkForUpdates(displayNoUpdateAvailable,
+    'https://raw.githubusercontent.com/vinnymac/PokeNurse/master/package.json',
+    'https://github.com/vinnymac/PokeNurse/releases/latest',
+  )
+}
diff --git a/main/main_menu.js b/main/mainMenu.js
similarity index 93%
rename from main/main_menu.js
rename to main/mainMenu.js
index f063a82..7656a2d 100644
--- a/main/main_menu.js
+++ b/main/mainMenu.js
@@ -1,4 +1,6 @@
-const { app, dialog, BrowserWindow, shell } = require('electron')
+import { app, dialog, BrowserWindow, shell } from 'electron'
+
+import checkForUpdates from './checkForUpdates'
 
 const name = app.getName()
 
@@ -92,6 +94,14 @@ const template = [
     label: 'Help',
     role: 'help',
     submenu: [
+      {
+        label: 'Check for Updates',
+        accelerator: 'CmdOrCtrl+U',
+        click: checkForUpdates.bind(null, { displayNoUpdateAvailable: true }),
+      },
+      {
+        type: 'separator'
+      },
       {
         label: 'Visit Homepage',
         click() { shell.openExternal('https://github.com/vinnymac/PokeNurse') }
diff --git a/main/updateAvailable.js b/main/updateAvailable.js
new file mode 100644
index 0000000..b848b00
--- /dev/null
+++ b/main/updateAvailable.js
@@ -0,0 +1,32 @@
+import semver, {
+  Range
+} from 'semver'
+
+// Some of the below logic is borrowed from
+// https://www.npmjs.com/package/npm-check-updates
+
+function isWildCard(version) {
+  return WILDCARD_PURE_REGEX.test(version)
+}
+
+const WILDCARDS_PURE = ['^', '~', '^*', '*', 'x', 'x.x', 'x.x.x']
+let WILDCARDS_PARTS = `^(${WILDCARDS_PURE.join('|')}`.replace(/\^/g, '\\^').replace(/\*/g, '\\*')
+WILDCARDS_PARTS += ')$'
+const WILDCARD_PURE_REGEX = new RegExp(WILDCARDS_PARTS)
+
+function updateAvailable(current, latest) {
+  // do not upgrade non-npm version declarations (such as git tags)
+  // do not upgrade versionUtil.wildcards
+  if (!semver.validRange(current) || isWildCard(current)) {
+    return false
+  }
+
+  const version = new Range(current)
+
+  // make sure it is a valid range
+  // not upgradeable if the latest version satisfies the current range
+  // not upgradeable if the specified version is newer than the latest (indicating a prerelease version)
+  return Boolean(semver.validRange(version)) && !semver.satisfies(latest, version) && !semver.ltr(latest, version)
+}
+
+export default updateAvailable
diff --git a/main/utils.js b/main/utils.js
deleted file mode 100644
index bb1baca..0000000
--- a/main/utils.js
+++ /dev/null
@@ -1,327 +0,0 @@
-import times from 'lodash/times'
-
-import baseStats from '../baseStats'
-
-const levelCpMultiplier = {
-  1: 0.094,
-  1.5: 0.135137432,
-  2: 0.16639787,
-  2.5: 0.192650919,
-  3: 0.21573247,
-  3.5: 0.236572661,
-  4: 0.25572005,
-  4.5: 0.273530381,
-  5: 0.29024988,
-  5.5: 0.306057377,
-  6: 0.3210876,
-  6.5: 0.335445036,
-  7: 0.34921268,
-  7.5: 0.362457751,
-  8: 0.37523559,
-  8.5: 0.387592406,
-  9: 0.39956728,
-  9.5: 0.411193551,
-  10: 0.42250001,
-  10.5: 0.432926419,
-  11: 0.44310755,
-  11.5: 0.453059958,
-  12: 0.46279839,
-  12.5: 0.472336083,
-  13: 0.48168495,
-  13.5: 0.4908558,
-  14: 0.49985844,
-  14.5: 0.508701765,
-  15: 0.51739395,
-  15.5: 0.525942511,
-  16: 0.53435433,
-  16.5: 0.542635767,
-  17: 0.55079269,
-  17.5: 0.558830576,
-  18: 0.56675452,
-  18.5: 0.574569153,
-  19: 0.58227891,
-  19.5: 0.589887917,
-  20: 0.59740001,
-  20.5: 0.604818814,
-  21: 0.61215729,
-  21.5: 0.619399365,
-  22: 0.62656713,
-  22.5: 0.633644533,
-  23: 0.64065295,
-  23.5: 0.647576426,
-  24: 0.65443563,
-  24.5: 0.661214806,
-  25: 0.667934,
-  25.5: 0.674577537,
-  26: 0.68116492,
-  26.5: 0.687680648,
-  27: 0.69414365,
-  27.5: 0.700538673,
-  28: 0.70688421,
-  28.5: 0.713164996,
-  29: 0.71939909,
-  29.5: 0.725571552,
-  30: 0.7317,
-  30.5: 0.734741009,
-  31: 0.73776948,
-  31.5: 0.740785574,
-  32: 0.74378943,
-  32.5: 0.746781211,
-  33: 0.74976104,
-  33.5: 0.752729087,
-  34: 0.75568551,
-  34.5: 0.758630378,
-  35: 0.76156384,
-  35.5: 0.764486065,
-  36: 0.76739717,
-  36.5: 0.770297266,
-  37: 0.7731865,
-  37.5: 0.776064962,
-  38: 0.77893275,
-  38.5: 0.781790055,
-  39: 0.78463697,
-  39.5: 0.787473578,
-  40: 0.79030001,
-  40.5: 0.7931164
-}
-
-function getLevel(cpMultiplier) {
-  let level
-
-  if (cpMultiplier < 0.734) {
-    // compute polynomial approximation obtained by regression
-    level = 58.35178527 * cpMultiplier * cpMultiplier - 2.838007664 * cpMultiplier + 0.8539209906
-  } else {
-    // compute linear approximation obtained by regression
-    level = 171.0112688 * cpMultiplier - 95.20425243
-  }
-
-  // round to nearest .5 value and return
-  return Math.round((level) * 2) / 2.0
-}
-
-function getMaxCostsForPowerup(
-  trainerLevel,
-  powerups,
-  pokemonsCPMultiplier,
-  transform,
-  upgradesPerLevel = 2,
-  allowedLevelsAbovePlayer = 2
-) {
-  // The Maximum Level this pokemon can reach
-  const maxLevelOfPokemon = trainerLevel + allowedLevelsAbovePlayer
-  // The current level of the pokemon based on its `cp_multiplier` property
-  const currentLevelOfPokemon = utils.getLevelFromCpMultiplier(pokemonsCPMultiplier)
-
-  // Number of Upgrades to Maximum
-  // So if your current level was 3 and if it could max at 20,
-  // that would be 17 Upgrades * 2 Upl - 1 = 33 Upgrades
-  const numberOfUpgrades = ((maxLevelOfPokemon - currentLevelOfPokemon) * upgradesPerLevel) - 1
-
-  // initialize our total cost for candies or dust
-  let total = transform(levelCpMultiplier[currentLevelOfPokemon], powerups)
-  let currentPowerUps = powerups + 1
-
-  // The difference between any two adjacent levels +-
-  const levelSize = 0.5
-
-  times(numberOfUpgrades, (i) => {
-    // The number that represents the current upgrade
-    const upgradeNumber = i + 1
-    // The level the pokemon will become if upgraded
-    // currentLevelOfPokemon could be 3, if the index is 0, upgradeNumber is 1
-    // so we get (1 * .5) + 3
-    const level = (upgradeNumber * levelSize) + currentLevelOfPokemon
-    // the number of power ups previously applied and the number we are applying
-    // so if you used 4, the first index is 0 so 4
-    currentPowerUps += i
-
-    // a candy or dust cost calculated from
-    // a levels cp multiplier and the current number of power ups used
-    total += transform(levelCpMultiplier[level], currentPowerUps)
-  })
-
-  return total
-}
-
-const utils = {
-  levelCpMultiplier,
-
-  getLevelFromCpMultiplier(multiplier) {
-    return getLevel(multiplier)
-  },
-
-  getMaxCp(attack, defense, stamina) {
-    return utils.getMaxCpForTrainerLevel(attack, defense, stamina, 40)
-  },
-
-  getMaxCpForTrainerLevel(attack, defense, stamina, trainerLevel) {
-    const maxPokemonLevel = Math.min(40.5, trainerLevel + 1.5)
-    const maxCpMultiplier = levelCpMultiplier[maxPokemonLevel]
-    const ADS = attack * Math.pow(defense, 0.5) * Math.pow(stamina, 0.5)
-    const total = ADS * Math.pow(maxCpMultiplier, 2.0)
-    return Math.floor(total / 10)
-  },
-
-  getStardustCostsForPowerup(cpMultiplier, powerups) {
-    const level = utils.getLevelFromCpMultiplier(cpMultiplier)
-
-    if (level <= 2.5 && powerups <= 5) {
-      return 200
-    }
-    if (level <= 4.5 && powerups <= 9) {
-      return 400
-    }
-    if (level <= 6.5 && powerups <= 13) {
-      return 600
-    }
-    if (level <= 8.5 && powerups <= 17) {
-      return 800
-    }
-    if (level <= 10.5 && powerups <= 21) {
-      return 1000
-    }
-    if (level <= 12.5 && powerups <= 25) {
-      return 1300
-    }
-    if (level <= 14.5 && powerups <= 29) {
-      return 1600
-    }
-    if (level <= 16.5 && powerups <= 33) {
-      return 1900
-    }
-    if (level <= 18.5 && powerups <= 37) {
-      return 2200
-    }
-    if (level <= 20.5 && powerups <= 41) {
-      return 2500
-    }
-    if (level <= 22.5 && powerups <= 45) {
-      return 3000
-    }
-    if (level <= 24.5 && powerups <= 49) {
-      return 3500
-    }
-    if (level <= 26.5 && powerups <= 53) {
-      return 4000
-    }
-    if (level <= 28.5 && powerups <= 57) {
-      return 4500
-    }
-    if (level <= 30.5 && powerups <= 61) {
-      return 5000
-    }
-    if (level <= 32.5 && powerups <= 65) {
-      return 6000
-    }
-    if (level <= 34.5 && powerups <= 69) {
-      return 7000
-    }
-    if (level <= 36.5 && powerups <= 73) {
-      return 8000
-    }
-    if (level <= 38.5 && powerups <= 77) {
-      return 9000
-    }
-    return 10000
-  },
-
-  getCandyCostsForPowerup(cpMultiplier, powerups) {
-    const level = utils.getLevelFromCpMultiplier(cpMultiplier)
-
-    if (level <= 10.5 && powerups <= 21) {
-      return 1
-    }
-    if (level <= 20.5 && powerups <= 41) {
-      return 2
-    }
-    if (level <= 25.5 && powerups <= 51) {
-      return 3
-    }
-    if (level <= 30.5 && powerups <= 61) {
-      return 4
-    }
-    if (level <= 32.5 && powerups <= 65) {
-      return 6
-    }
-    if (level <= 34.5 && powerups <= 69) {
-      return 8
-    }
-    if (level <= 36.5 && powerups <= 73) {
-      return 10
-    }
-    if (level <= 38.5 && powerups <= 77) {
-      return 12
-    }
-    return 15
-  },
-
-  getCpAfterPowerup(cp, cpMultiplier) {
-    const level = utils.getLevelFromCpMultiplier(cpMultiplier)
-
-    if (level <= 10) {
-      return (cp * 0.009426125469) / Math.pow(cpMultiplier, 2)
-    }
-    if (level <= 20) {
-      return (cp * 0.008919025675) / Math.pow(cpMultiplier, 2)
-    }
-    if (level <= 30) {
-      return (cp * 0.008924905903) / Math.pow(cpMultiplier, 2)
-    }
-    return (cp * 0.00445946079) / Math.pow(cpMultiplier, 2)
-  },
-
-  getMaxCandyCostsForPowerup(
-    trainerLevel,
-    powerups,
-    pokemonsCPMultiplier,
-    upgradesPerLevel,
-    allowedLevelsAbovePlayer
-  ) {
-    return getMaxCostsForPowerup(
-      trainerLevel,
-      powerups,
-      pokemonsCPMultiplier,
-      utils.getCandyCostsForPowerup,
-      upgradesPerLevel,
-      allowedLevelsAbovePlayer
-    )
-  },
-
-  getMaxStardustCostsForPowerup(
-    trainerLevel,
-    powerups,
-    pokemonsCPMultiplier,
-    upgradesPerLevel,
-    allowedLevelsAbovePlayer
-  ) {
-    return getMaxCostsForPowerup(
-      trainerLevel,
-      powerups,
-      pokemonsCPMultiplier,
-      utils.getStardustCostsForPowerup,
-      upgradesPerLevel,
-      allowedLevelsAbovePlayer
-  )
-  },
-
-  getADS(pokemon) {
-    return pokemon.individual_attack + pokemon.individual_defense + pokemon.individual_stamina
-  },
-
-  getIVs(pokemon) {
-    return Math.round(utils.getADS(pokemon) / 45 * 10000) / 100
-  },
-
-  getEvolvesCount({ candy, count, pokemon_id }) {
-    let evolves = Math.floor(candy / baseStats.pokemon[pokemon_id].evolveCost)
-
-    if ((evolves === Infinity || isNaN(evolves))) {
-      evolves = 0
-    }
-
-    return (evolves > count ? count : evolves)
-  }
-}
-
-export default utils
diff --git a/package.js b/package.js
index 427502b..206d3b4 100644
--- a/package.js
+++ b/package.js
@@ -47,11 +47,11 @@ if (version) {
   startPack()
 } else {
   // use the same version as the currently-installed electron-prebuilt
-  exec('npm list electron-prebuilt --dev', (err, stdout) => {
+  exec('npm view electron-prebuilt version', (err, stdout) => {
     if (err) {
       DEFAULT_OPTS.version = '1.2.0'
     } else {
-      DEFAULT_OPTS.version = stdout.split('electron-prebuilt@')[1].replace(/\s/g, '')
+      DEFAULT_OPTS.version = pkg.devDependencies['electron-prebuilt']
     }
 
     startPack()
@@ -86,6 +86,11 @@ async function startPack() {
           pack(plat, arch, log(plat, arch))
         })
       })
+    } else if (argv.platform || argv.arch) {
+      const arch = argv.arch || os.arch()
+      const platform = argv.platform || os.platform()
+
+      pack(platform, arch, log(platform, arch))
     } else {
       // build for current platform only
       pack(os.platform(), os.arch(), log(os.platform(), os.arch()))
diff --git a/package.json b/package.json
index a4c78ca..a1c8ba8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "PokeNurse",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "A tool for Pokémon Go to aid in transferring and evolving Pokémon",
   "main": "main",
   "scripts": {
@@ -36,7 +36,8 @@
   },
   "homepage": "https://github.com/vinnymac/PokeNurse#readme",
   "devDependencies": {
-    "asar": "0.12.2",
+    "asar": "0.12.3",
+    "async-file": "^2.0.0",
     "babel-core": "6.14.0",
     "babel-eslint": "^6.1.2",
     "babel-loader": "^6.2.5",
@@ -51,22 +52,22 @@
     "babel-preset-stage-0": "^6.5.0",
     "babel-register": "6.14.0",
     "concurrently": "^2.2.0",
-    "cross-env": "^2.0.0",
+    "cross-env": "2.0.1",
     "css-loader": "^0.24.0",
     "del": "^2.2.2",
     "devtron": "^1.3.0",
     "electron-debug": "^1.0.1",
     "electron-devtools-installer": "^2.0.1",
     "electron-packager": "7.7.0",
-    "electron-prebuilt": "1.3.4",
-    "electron-rebuild": "^1.2.0",
-    "eslint": "^3.3.1",
+    "electron-prebuilt": "1.3.5",
+    "electron-rebuild": "1.2.1",
+    "eslint": "3.4.0",
     "eslint-config-airbnb": "^10.0.1",
     "eslint-import-resolver-webpack": "^0.5.1",
     "eslint-plugin-import": "1.14.0",
-    "eslint-plugin-jsx-a11y": "^2.1.0",
+    "eslint-plugin-jsx-a11y": "2.2.1",
     "eslint-plugin-no-loops": "^0.3.0",
-    "eslint-plugin-react": "^6.1.2",
+    "eslint-plugin-react": "6.2.0",
     "express": "^4.14.0",
     "fbjs-scripts": "^0.7.1",
     "file-loader": "^0.9.0",
@@ -80,8 +81,10 @@
     "react-dom": "15.3.1",
     "react-redux": "^4.4.5",
     "redux": "^3.5.2",
-    "redux-actions": "^0.11.0",
+    "redux-actions": "0.12.0",
     "redux-logger": "^2.6.1",
+    "redux-thunk": "^2.1.0",
+    "semver": "^5.3.0",
     "style-loader": "^0.13.1",
     "webpack": "1.13.2",
     "webpack-dashboard": "0.1.8",
@@ -91,8 +94,8 @@
   },
   "dependencies": {
     "bootstrap": "^3.3.7",
-    "node-pogo-protos": "1.4.0",
-    "pogobuf": "1.6.0",
+    "node-pogo-protos": "1.5.0",
+    "pogobuf": "1.7.0",
     "source-map-support": "^0.4.2"
   },
   "devEngines": {
diff --git a/webpack.config.base.js b/webpack.config.base.js
index 7119cf0..9784f24 100644
--- a/webpack.config.base.js
+++ b/webpack.config.base.js
@@ -11,6 +11,14 @@ export default {
       {
         test: /\.json$/,
         loader: 'json-loader'
+      },
+      {
+        test: /pokenurse.css$/,
+        loader: ('style!css')
+      },
+      {
+        test: /\.(jpe?g|png|gif|svg|ico)$/i,
+        loader: 'file'
       }
     ]
   },
@@ -27,7 +35,8 @@ export default {
 
   ],
   externals: [
-    // put your node 3rd party libraries which can't be built with webpack here
-    // (mysql, mongodb, and so on..)
+    'pogobuf',
+    'node-pogo-protos',
+    'bootstrap'
   ]
 }
diff --git a/webpack.config.development.js b/webpack.config.development.js
index 1eaa7bd..4706f65 100644
--- a/webpack.config.development.js
+++ b/webpack.config.development.js
@@ -12,6 +12,7 @@ export default merge(baseConfig, {
 
   entry: [
     `webpack-hot-middleware/client?path=http://localhost:${PORT}/__webpack_hmr`,
+    'babel-polyfill',
     './app/index'
   ],
 
@@ -19,19 +20,6 @@ export default merge(baseConfig, {
     publicPath: `http://localhost:${PORT}/dist/`
   },
 
-  module: {
-    loaders: [
-      {
-        test: /pokenurse.css$/,
-        loader: ('style!css')
-      },
-      {
-        test: /\.(jpe?g|png|gif|svg|ico)$/i,
-        loader: 'file'
-      }
-    ]
-  },
-
   plugins: [
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoErrorsPlugin(),
diff --git a/webpack.config.electron.js b/webpack.config.electron.js
index 8f6c300..8c272af 100644
--- a/webpack.config.electron.js
+++ b/webpack.config.electron.js
@@ -13,12 +13,11 @@ export default merge(baseConfig, {
   },
 
   plugins: [
-    // TODO PogoBuf breaks uglifier
-    // new webpack.optimize.UglifyJsPlugin({
-    //   compressor: {
-    //     warnings: false
-    //   }
-    // }),
+    new webpack.optimize.UglifyJsPlugin({
+      compressor: {
+        warnings: false
+      }
+    }),
     new webpack.BannerPlugin(
       'require("source-map-support").install();',
       { raw: true, entryOnly: false }
@@ -39,11 +38,7 @@ export default merge(baseConfig, {
 
   externals: [
     'source-map-support',
-    'pogobuf',
-    'node-pogo-protos',
     'electron-devtools-installer',
-    'bootstrap',
-    'react-burger-menu',
   ],
 
   noParse: /json-schema\/lib\/validate\.js/
diff --git a/webpack.config.production.js b/webpack.config.production.js
index 967dcff..5c2636b 100644
--- a/webpack.config.production.js
+++ b/webpack.config.production.js
@@ -6,25 +6,15 @@ import baseConfig from './webpack.config.base'
 const config = merge(baseConfig, {
   devtool: 'cheap-module-source-map',
 
-  entry: './app/index',
+  entry: [
+    'babel-polyfill',
+    './app/index',
+  ],
 
   output: {
     publicPath: '../dist/'
   },
 
-  module: {
-    loaders: [
-      {
-        test: /pokenurse.css$/,
-        loader: ('style!css')
-      },
-      {
-        test: /\.(jpe?g|png|gif|svg|ico)$/i,
-        loader: 'file'
-      }
-    ]
-  },
-
   plugins: [
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.DefinePlugin({