diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index d982882..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-name: Pyflakes Syntax Checker
-
-on: push
-
-jobs:
-  syntax-check:
-    name: Pyflakes Syntax Checker
-    runs-on: ubuntu-latest
-    steps:
-      - name: Pyflakes Syntax Checker
-        uses: lgeiger/pyflakes-action@v1.0.1
diff --git a/.github/workflows/pep8.yml b/.github/workflows/pep8.yml
new file mode 100644
index 0000000..59af227
--- /dev/null
+++ b/.github/workflows/pep8.yml
@@ -0,0 +1,35 @@
+name: PEP8 Linting
+
+on: push
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.7
+    - name: Install pipenv & sync
+      run: |
+        cd triple-dungeon
+        python -m pip install --upgrade pip
+        pip install pipenv
+        pipenv lock
+        pipenv sync
+    - name: Lint 
+      run: |
+        pip install pycodestyle
+        # PyCharm sets line length at 120 chars
+        pycodestyle . --count --statistics --max-line-length=120
+        
+        # stop the build if there are Python syntax errors or undefined names
+        # flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+#    - name: Test with pytest
+#      run: |
+#        pip install pytest
+#        pytest