diff --git a/coll_objs/COLL_OBJS.TXT b/coll_objs/COLL_OBJS.TXT
new file mode 100755
index 000000000..4cde9ec65
--- /dev/null
+++ b/coll_objs/COLL_OBJS.TXT
@@ -0,0 +1,7 @@
+l 0.9 0.6 0.25 0.1 1.0 1 1
+B -2.1 2.1 -2.1 -1.9 -0.6 1.0
+B -2.1 2.1 1.9 2.1 -0.6 1.0
+B -2.1 -1.9 -2.1 2.1 -0.6 1.0
+B 1.9 2.1 -2.1 2.1 -0.6 1.0
+# B -3.0 -2.0 2.9 3.1 -0.6 -0.1
+
diff --git a/coll_objs/COLL_OBJS1.TXT b/coll_objs/COLL_OBJS1.TXT
new file mode 100755
index 000000000..9cb35d04c
--- /dev/null
+++ b/coll_objs/COLL_OBJS1.TXT
@@ -0,0 +1,14 @@
+t 0.0 0.0 0.0
+
+l 0.9 0.6 0.25 0.1 1.0 -1 1
+B -2.0 2.0 -2.0 2.0 -4.0 -3.8
+l 1.0 0.0 0.0 0.1 1.0 -1 1
+B -2.0 2.0 -2.0 2.0 -3.0 -2.8
+
+l 0.0 0.0 1.0 0.1 1.0 -1 1
+B -2.0 -1.9 0.0 2.0 -3.8 -3.0
+B -2.0 2.0 -2.0 -1.9 -3.8 -3.0
+B 1.9 2.0 -2.0 2.0 -3.8 -3.0
+B -2.0 2.0 1.9 2.0 -3.8 -3.0
+
+
diff --git a/coll_objs/COLL_OBJS2.TXT b/coll_objs/COLL_OBJS2.TXT
new file mode 100755
index 000000000..265f925c9
--- /dev/null
+++ b/coll_objs/COLL_OBJS2.TXT
@@ -0,0 +1,7 @@
+l 0.9 0.6 0.25 0.1 1.0 -1 1
+B -0.5 0.5 -0.5 0.5 -0.5 0.20
+l 0.9 1.0 0.00 0.0 1.0 -1 1
+B -0.2 0.2 -0.2 0.2 -0.5 0.22
+l 0.9 0.0 0.00 1.0 1.0 -1 1
+B -0.2 0.2 -0.2 0.2 0.40 0.50
+B -0.2 -0.1 -0.2 -0.1 0.30 0.40
diff --git a/coll_objs/COLL_OBJS3.TXT b/coll_objs/COLL_OBJS3.TXT
new file mode 100755
index 000000000..309ecf19b
--- /dev/null
+++ b/coll_objs/COLL_OBJS3.TXT
@@ -0,0 +1,19 @@
+t 0.0 0.0 -3.1
+
+l 0.9 0.6 0.25 0.1 1.0 -1 1
+B -0.5 0.5 -0.5 0.5 -0.5 0.20
+
+B -0.5 -0.4 -0.5 -0.4 0.20 0.22
+B -0.4 -0.3 -0.5 -0.4 0.22 0.24
+B -0.3 -0.2 -0.5 -0.4 0.24 0.26
+B -0.2 -0.1 -0.5 -0.4 0.26 0.28
+B -0.1 0.0 -0.5 -0.4 0.28 0.30
+B 0.0 0.1 -0.5 -0.4 0.30 0.32
+B 0.1 0.2 -0.5 -0.4 0.32 0.34
+B 0.2 0.3 -0.5 -0.4 0.34 0.36
+
+l 0.7 0.0 0.0 1.0 0.5 -1 1
+S -0.5 -0.5 0.3 0.25
+
+l 0.7 1.0 0.0 0.0 0.7 -1 1
+C -0.5  0.5 -0.3 -0.5 0.5 0.3 0.2 0.2
diff --git a/coll_objs/COLL_OBJS_Maze.TXT b/coll_objs/COLL_OBJS_Maze.TXT
new file mode 100755
index 000000000..69469aed9
--- /dev/null
+++ b/coll_objs/COLL_OBJS_Maze.TXT
@@ -0,0 +1,24 @@
+l 0.9 0.6 0.25 0.1 1.0 1 1
+B -3.0 -2.0 -3.1 -2.9 -0.6 -0.1
+B -3.0 -2.0 -1.6 -1.4 -0.6 -0.1
+B -3.0 -2.0 -0.1  0.1 -0.6 -0.1
+B -3.0 -2.0  1.4  1.6 -0.6 -0.1
+B -3.0 -2.0  2.9  3.1 -0.6 -0.1
+
+B -1.5 -0.5 -3.1 -2.9 -0.6 -0.1
+B -1.5 -0.5 -1.6 -1.4 -0.6 -0.1
+B -1.5 -0.5 -0.1  0.1 -0.6 -0.1
+B -1.5 -0.5  1.4  1.6 -0.6 -0.1
+B -1.5 -0.5  2.9  3.1 -0.6 -0.1
+
+B  0.5  1.5 -3.1 -2.9 -0.6 -0.1
+B  0.5  1.5 -1.6 -1.4 -0.6 -0.1
+B  0.5  1.5 -0.1  0.1 -0.6 -0.1
+B  0.5  1.5  1.4  1.6 -0.6 -0.1
+B  0.5  1.5  2.9  3.1 -0.6 -0.1
+
+B  2.0  3.0 -3.1 -2.9 -0.6 -0.1
+B  2.0  3.0 -1.6 -1.4 -0.6 -0.1
+B  2.0  3.0 -0.1  0.1 -0.6 -0.1
+B  2.0  3.0  1.4  1.6 -0.6 -0.1
+B  2.0  3.0  2.9  3.1 -0.6 -0.1
diff --git a/coll_objs/COLL_OBJS_River.TXT b/coll_objs/COLL_OBJS_River.TXT
new file mode 100755
index 000000000..33302edf9
--- /dev/null
+++ b/coll_objs/COLL_OBJS_River.TXT
@@ -0,0 +1 @@
+w 1.8 2.8 3.0
\ No newline at end of file
diff --git a/coll_objs/COLL_OBJS_Test.TXT b/coll_objs/COLL_OBJS_Test.TXT
new file mode 100755
index 000000000..c67be0b78
--- /dev/null
+++ b/coll_objs/COLL_OBJS_Test.TXT
@@ -0,0 +1,10 @@
+t 0.0 0.0 -3.5 # translate -Z
+l 0.8 0.7 0.7 0.7 1.0 -1 1 # elasticity R G B A texture_id draw
+#B -4.4 4.4 -0.1 0.1 -2.0 2.0
+
+m 0.1 # scale
+s 1 2 # swap Y and Z
+M 2 # mirror in Z
+
+#O ..\Sponza\sponza.obj
+
diff --git a/heightmap.raw b/heightmap.raw
new file mode 100755
index 000000000..6d718c01d
Binary files /dev/null and b/heightmap.raw differ
diff --git a/heightmap_flood.bmp b/heightmap_flood.bmp
new file mode 100755
index 000000000..19c27cb75
Binary files /dev/null and b/heightmap_flood.bmp differ
diff --git a/heightmap_river.bmp b/heightmap_river.bmp
new file mode 100755
index 000000000..752da2572
Binary files /dev/null and b/heightmap_river.bmp differ
diff --git a/makefile b/makefile
new file mode 100755
index 000000000..ed3999f79
--- /dev/null
+++ b/makefile
@@ -0,0 +1,79 @@
+
+VPATH=../src
+#CPPFLAGS=-g -Wall 
+CPPFLAGS=-g -Wall -O3
+TARGET=../lib/3dworld
+OBJS=$(shell cat ../src/obj_list)
+TARGET2=
+OBJS2= 
+
+LIB_TARGET=
+LIB_OBJS=
+
+#LINK=g++ $(CPPFLAGS) -lz -lpng -lpthread -L/usr/X11R6/lib64 -lglut -lGL -lGLU
+LINK=g++ $(CPPFLAGS) -lz -lpng -lpthread $(shell pkg-config --libs xrender) -lglui -lglut -lGL -lGLU
+
+LFLAGS=$(LIB_TARGET)
+
+#  In most cases, you should not change anything below this line.
+ifeq ($(shell test -L makefile ; echo $$? ),1)
+all : 
+	@echo "makefile should be a symbolic link to avoid accidentally building in the src directory ... attempting to create ../obj,../lib,../run, symlink makefile in ../obj, and recurse make into ../obj"
+	-mkdir ../obj
+	-mkdir ../run
+	-mkdir ../lib
+	-ln -s ../src/makefile ../obj/makefile
+	cd ../obj && $(MAKE)
+else
+
+# disable old-style .SUFFIXES rules. this may not be needed?
+.SUFFIXES:
+
+%.o : %.C
+	$(CPP) $(CPPFLAGS) -MMD -c $<
+%.o : %.cc
+	$(CPP) $(CPPFLAGS) -MMD -c $<
+%.o : %.cpp
+	$(CPP) $(CPPFLAGS) -MMD -c $<
+
+CPP=g++
+
+%.d: %.C
+	touch $@
+%.d: %.cc
+	touch $@
+%.d: %.cpp
+	touch $@
+
+DEPENDENCIES = $(OBJS2:.o=.d) $(OBJS:.o=.d) $(LIB_OBJS:.o=.d)
+
+# 
+# Targets:
+# 
+
+all : $(TARGET) $(TARGET2)
+
+ifneq ($(LIB_TARGET),"")
+$(LIB_TARGET): $(LIB_OBJS) 
+	$(LINK) $(FLAGS) -shared -o $(LIB_TARGET) $(LIB_OBJS)
+endif
+
+$(TARGET): $(OBJS) $(LIB_TARGET)
+	$(LINK) $(FLAGS) -o $(TARGET) $(OBJS) $(LFLAGS)
+
+ifneq ($(TARGET2),"")
+$(TARGET2): $(OBJS2) $(LIB_TARGET)
+	$(LINK) $(FLAGS) -o $(TARGET2) $(OBJS2) $(LFLAGS)
+endif
+
+.PHONY : clean
+
+clean:
+	-rm -f $(TARGET) $(TARGET2) $(OBJS) $(OBJS2) $(LIB_TARGET) $(LIB_OBJS) $(DEPENDENCIES) make.dep
+
+make.dep: $(DEPENDENCIES)
+	-cat $(DEPENDENCIES) > make.dep
+
+include make.dep
+
+endif
\ No newline at end of file
diff --git a/obj_list b/obj_list
new file mode 100755
index 000000000..2931e54c6
--- /dev/null
+++ b/obj_list
@@ -0,0 +1,53 @@
+3DWorld.o
+ai.o
+build_world.o
+coll_cell_search.o
+collision_detect.o
+csg.o
+display_world.o
+draw_mech.o
+draw_mesh.o
+draw_shapes.o
+draw_ship.o
+draw_world.o
+explosion.o
+free_obj.o
+Gameplay.o
+gen_object.o
+glflare.o
+intersect.o
+lightmap.o
+lightning.o
+Loadlum.o
+map_view.o
+Math3d.o
+matrix_ops.o
+mesh_gen.o
+objects.o
+Ocean.o
+Physics.o
+quartic.o
+scenery.o
+shape_line3d.o
+ship_base.o
+ship_config.o
+ship.o
+ship_intersect.o
+ship_query.o
+sm_tree.o
+spillover.o
+Terrain.o
+Textures.o
+Thread.o
+Tree.o
+u_event.o
+Universe_control.o
+Universe.o
+u_ship.o
+visibility.o
+Water.o
+screenshot.o
+mesh_intersect.o
+draw_primitives.o
+shadows.o
+