diff --git a/.gitignore b/.gitignore
index ac5421e..253bf6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,15 @@ docuptmp
 *.c
 *.so
 *.o
+*.o*
 *.meta
 *.link
 old
 retropikzel.*
+import
 test/import
+pffi-define
 test/pffi-define
+retropikzel/pffi/*/*.c
+retropikzel/pffi/*/*.o*
+retropikzel/pffi/*/*.so
diff --git a/Makefile b/Makefile
index bb29cdb..3ce708d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,13 +11,14 @@ RACKET=racket -I r7rs --make -S $(shell pwd) --script
 STKLOS=STKLOS_FRAMES=200 stklos -A . --compiler-flags='+line-info,+time-display,unroll-iterations=3' -f
 KAWA=java --add-exports java.base/jdk.internal.foreign.abi=ALL-UNNAMED --add-exports java.base/jdk.internal.foreign.layout=ALL-UNNAMED --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED --enable-native-access=ALL-UNNAMED --enable-preview -jar kawa.jar --r7rs --full-tailcalls -Dkawa.import.path=".."
 CYCLONE=cyclone -t -A .
-GAMBIT=gsc -:r7rs .
+GAMBIT=gsc -:r7rs,search=$(shell pwd),debug=ar9
+GAMBIT_I=gsi -:r7rs,search=$(shell pwd)
 CHICKEN_ENV=CHICKEN_REPOSITORY_PATH=${ENV_CHICKEN_REPOSITORY_PATH}:${CHICKEN_INSTALL_REPOSITORY}:$(shell pwd) CHICKEN_INCLUDE_PATH=$(shell pwd) LD_LIBRARY_PATH=${GUIX_ENVIRONMENT}/lib
 CHICKEN=${CHICKEN_ENV} csc -X r7rs -R r7rs -sJ
 CHICKEN_I=${CHICKEN_ENV} csi -R r7rs -s
 GERBIL=gxc -exe -prelude :scheme/r7rs
 
-build: build-rkt build-main-scm build-main-chicken
+build: build-rkt build-main-scm build-main-chicken build-main-gambit
 
 chicken-install:
 	mkdir -p ${CHICKEN_INSTALL_REPOSITORY}
@@ -37,16 +38,16 @@ build-main-chicken:
 	cp retropikzel/pffi/${VERSION}/chicken.scm retropikzel/pffi/${VERSION}/retropikzel.pffi.${VERSION}.chicken.scm
 	cp retropikzel/pffi/${VERSION}/main.sld retropikzel.pffi.${VERSION}.main.scm
 	cp retropikzel/pffi/${VERSION}/chicken.scm retropikzel.pffi.${VERSION}.chicken.scm
-	#${CHICKEN} -o retropikzel/pffi/${VERSION}/retropikzel.pffi.${VERSION}.chicken.so \
-		#retropikzel/pffi/${VERSION}/retropikzel.pffi.${VERSION}.chicken.scm
-	#${CHICKEN} -o retropikzel/pffi/${VERSION}/retropikzel.pffi.${VERSION}.main.so \
-		#retropikzel/pffi/${VERSION}/retropikzel.pffi.${VERSION}.main.scm
-	#${CHICKEN} -o retropikzel.pffi.${VERSION}.chicken.so retropikzel.pffi.${VERSION}.chicken.scm
-	#${CHICKEN} -o retropikzel.pffi.${VERSION}.main.so retropikzel.pffi.${VERSION}.main.scm
 	${CHICKEN} retropikzel.pffi.${VERSION}.chicken.scm
 	${CHICKEN} retropikzel.pffi.${VERSION}.main.scm
 	cp *.so test/
 
+build-main-gambit:
+	${GAMBIT} -obj retropikzel/pffi/${VERSION}/gambit.scm
+	${GAMBIT} -obj retropikzel/pffi/${VERSION}/main.sld
+	#cp retropikzel/pffi/${VERSION}/*.o* test/
+
+
 update-documentation:
 	schubert document
 	mkdir -p docutmp
@@ -72,8 +73,8 @@ test/import.scm: clean build
 	#${GERBIL} $@
 
 test/import.scm: clean build
-	${CHICKEN_I} test/import.scm
-	${CHICKEN} -o test/import $@ && ${CHICKEN_ENV} test/import
+	${GAMBIT_I} $@
+	${GAMBIT} -exe $@ && ./test/import -:r7rs,search=$(shell cd .. && pwd)
 
 test/pffi-define.scm: clean build
 	${SASH} $@
@@ -115,7 +116,7 @@ test/sdl2.scm:
 clean:
 	rm -rf docutmp
 	rm -rf retropikzel/pffi/${VERSION}/*.c
-	rm -rf retropikzel/pffi/${VERSION}/*.o
+	rm -rf retropikzel/pffi/${VERSION}/*.o*
 	rm -rf retropikzel/pffi/${VERSION}/*.so
 	rm -rf retropikzel/pffi/${VERSION}/*.meta
 	rm -rf test/*.c
diff --git a/test/import.scm b/test/import.scm
index 9a4c219..6fc35c0 100644
--- a/test/import.scm
+++ b/test/import.scm
@@ -1,6 +1,8 @@
 (import (scheme base)
         (scheme write)
-        (retropikzel pffi v0-1-0 main))
+        (retropikzel pffi v0-1-0 main)
+
+        )
 
 (display "Hello")
 (newline)