diff --git a/render.py b/render.py
index 2f47e03..3606adb 100644
--- a/render.py
+++ b/render.py
@@ -21,6 +21,13 @@ class Renderer:
             if i.ttype == "standard":
                 i.update(self.tiles)
 
+    def inViewport(self, pos):
+        if pos[0] < 0 or pos[0] > self.viewport[0] - 1:
+            return False
+        if pos[1] < 0 or pos[1] > self.viewport[1] - 1:
+            return False
+        return True
+
     def selectForRendering(self):
         """
         Returns what tiles are in the viewport.
@@ -45,9 +52,8 @@ class Renderer:
 
         return tilesInScene
 
-<<<<<<< HEAD
     def render(self):
-        board = [["." for i in range(24)] for i in range(80)]
+        board = [["." for i in range(self.viewport[1])] for i in range(self.viewport[0])]
 
         toRender = self.selectForRendering()
 
@@ -70,5 +76,3 @@ class Renderer:
                 buf.append(rendered[j][i])
             print(''.join(buf))
 
-=======
->>>>>>> parent of 34d7984 (demo under construction)