diff --git a/src/Cell.js b/src/Cell.js
index e4983d4..68e36a7 100644
--- a/src/Cell.js
+++ b/src/Cell.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
+import { timingSafeEqual } from 'crypto';
 
 class Cell extends Component {
   render() {
@@ -8,8 +9,12 @@ class Cell extends Component {
       'Cell': true,
       'populated': this.props.populated
     });
+    const cellStyle = {
+      width: this.props.width,
+      height: this.props.height || this.props.width,
+    }
     return (
-      <div className={cellClass} onClick={this.props.onClick}>
+      <div className={cellClass} onClick={this.props.onClick} style={cellStyle}>
       </div>
     );
   }
@@ -17,10 +22,12 @@ class Cell extends Component {
 
 Cell.propTypes = {
   populated: PropTypes.bool,
+  width: PropTypes.number.isRequired,
+  height: PropTypes.number,
 };
 
 Cell.defaultProps = {
-  populated: false
+  populated: false,
 };
 
 export default Cell;
diff --git a/src/GameOfLife.css b/src/GameOfLife.css
index 5c81779..50368f7 100755
--- a/src/GameOfLife.css
+++ b/src/GameOfLife.css
@@ -7,8 +7,6 @@
 
 .Cell {
   display:inline-block;
-  width:20px;
-  height:20px;
   box-sizing:border-box;
   border:1px solid black;
   border-right:none;
diff --git a/src/GameOfLife.js b/src/GameOfLife.js
index 9d3567f..a2c3945 100755
--- a/src/GameOfLife.js
+++ b/src/GameOfLife.js
@@ -25,7 +25,7 @@ class GameOfLife extends Component {
     return populatedCells.includes(cellIndex);
   }
 
-  getAdjacentCellIndices(x, y) {
+  getAdjacentCellCoordinates(x, y) {
     let left = x - 1;
     let right = x + 1;
     if (this.state.border === 'marquee') {
@@ -59,13 +59,22 @@ class GameOfLife extends Component {
 
   getPopulatedCellsAfter(populatedCells) {
     let newPopulatedCells = [];
+    // TODO: Make this more efficient. The smallest
+    // number that it could possibly be be is the
+    // smallest in the pop. cells minus (width + 1)
+    // and the biggest is the biggest in pop. cells
+    // plus (width + 1). But need to take marquee borders
+    // into account. Could do a for (let x of candidates(populatedCells))
+    // to make a shortlist. Or could go through each populated cell,
+    // go through each neighbour, then add it to the "checked it"
+    // list - this is definitely more efficient
     for (let x = 0; x < this.state.width; x++) {
       for (let y = 0; y < this.state.height; y++) {
         const currentCellIndex = x + (y * this.state.width);
         let numberOfPopulatedNeighbours = 0;
         // let cellRight = x + 1 >= this.state.width ? 0 : x + 1;
         // let cellBelow = y + 1 >= this.state.height ? 0 : y + 1;
-        const { top, right, bottom, left } = this.getAdjacentCellIndices(x, y);
+        const { top, right, bottom, left } = this.getAdjacentCellCoordinates(x, y);
         let xOptions = x === right ? [left, x] : [left, x, right];
         let yOptions = y === bottom ? [top, y] : [top, y, bottom];
 
@@ -144,7 +153,7 @@ class GameOfLife extends Component {
     const worldSize = this.state.width * this.state.height;
     let cells = [];
     for (let i = 0; i < worldSize; i++) {
-      const props = { populated: false };
+      const props = { populated: false, width: this.props.cellWidth };
       if (this.state.populatedCells.includes(i)) {
         props.populated = true;
       }
@@ -155,7 +164,7 @@ class GameOfLife extends Component {
 
     const style = {
       display: 'block',
-      width: this.state.width * 20,
+      width: this.state.width * this.props.cellWidth,
     };
 
     return (
@@ -178,12 +187,14 @@ GameOfLife.propTypes = {
   start: PropTypes.bool,
   gridBehaviour: PropTypes.bool,
   border: PropTypes.oneOf(['hard', 'marquee']),
+  cellWidth: PropTypes.number,
 }
 
 GameOfLife.defaultProps = {
   generation: 0,
   start: false,
   border: 'hard',
+  cellWidth: 20,
 }
 
 export default GameOfLife;
diff --git a/src/index.js b/src/index.js
index 326685d..7afc72a 100755
--- a/src/index.js
+++ b/src/index.js
@@ -6,11 +6,12 @@ import * as serviceWorker from './serviceWorker';
 
 const gliderPopulation = [[1, 0], [2, 1], [0, 2], [1, 2], [2, 2],]
 ReactDOM.render(<GameOfLife
-    width={10}
-    height={10}
+    width={20}
+    height={20}
     startingPopulation={gliderPopulation}
     start={true}
     border='marquee'
+    cellWidth={10}
 />, document.getElementById('root'));
 
 // If you want your app to work offline and load faster, you can change