diff --git a/mp-s7-src/CMakeLists.txt b/mp-s7-src/CMakeLists.txt
index 7016ec1..d42f6c8 100644
--- a/mp-s7-src/CMakeLists.txt
+++ b/mp-s7-src/CMakeLists.txt
@@ -24,6 +24,18 @@ add_custom_target(
  COMMENT "Generating moduledefs.h"
 )
 
+#Generate the qstr.i.last file
+#TODO: check if this list matches the list above
+#TODO: check the include folders listed here, they need updating more
+#TODO: verify this is the output we need, it's too big and dynamic to diff on the baseline
+add_custom_target(
+ gen_qstr_i_last ALL
+ COMMAND ${CMAKE_C_COMPILER} -E -DNO_QSTR -Ibuild/tmp -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/../micropython -I${PROJECT_BINARY_DIR} -Wall -Werror -std=c99  -Os -DNDEBUG -fdata-sections -ffunction-sections ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/mpstate.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/malloc.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/gc.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/pystack.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/qstr.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/vstr.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/mpprint.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/unicode.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/mpz.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/reader.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/lexer.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/parse.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/scope.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/compile.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/emitcommon.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/emitbc.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/asmbase.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/asmx64.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/emitnx64.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/asmx86.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/emitnx86.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/asmthumb.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/emitnthumb.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/emitinlinethumb.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/asmarm.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/emitnarm.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/asmxtensa.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/emitnxtensa.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/emitinlinextensa.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/emitnxtensawin.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/formatfloat.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/parsenumbase.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/parsenum.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/emitglue.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/persistentcode.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/runtime.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/runtime_utils.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/scheduler.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/nativeglue.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/ringbuf.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/stackctrl.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/argcheck.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/warning.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/profile.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/map.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/obj.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objarray.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objattrtuple.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objbool.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objboundmeth.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objcell.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objclosure.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objcomplex.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objdeque.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objdict.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objenumerate.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objexcept.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objfilter.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objfloat.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objfun.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objgenerator.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objgetitemiter.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objint.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objint_longlong.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objint_mpz.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objlist.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objmap.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objmodule.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objobject.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objpolyiter.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objproperty.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objnone.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objnamedtuple.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objrange.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objreversed.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objset.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objsingleton.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objslice.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objstr.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objstrunicode.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objstringio.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objtuple.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objtype.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/objzip.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/opmethods.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/sequence.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/stream.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/binary.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/builtinimport.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/builtinevex.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/builtinhelp.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/modarray.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/modbuiltins.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/modcollections.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/modgc.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/modio.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/modmath.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/modcmath.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/modmicropython.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/modstruct.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/modsys.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/moduerrno.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/modthread.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/vm.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/bc.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/showbc.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/repl.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/smallint.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/frozenmod.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/moductypes.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/modujson.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/modure.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/moduzlib.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/moduheapq.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/modutimeq.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/moduhashlib.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/moducryptolib.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/modubinascii.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/virtpin.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/machine_mem.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/machine_pinbase.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/machine_signal.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/machine_pulse.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/machine_i2c.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/machine_spi.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/modbluetooth.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/modussl_axtls.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/modussl_mbedtls.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/modurandom.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/moduselect.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/moduwebsocket.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/modwebrepl.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/modframebuf.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/vfs.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/vfs_blockdev.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/vfs_reader.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/vfs_posix.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/vfs_posix_file.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/vfs_fat.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/vfs_fat_diskio.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/vfs_fat_file.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/vfs_lfs.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/utime_mphal.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/extmod/uos_dupterm.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/lib/embed/abort_.c ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/lib/utils/printf.c ${PROJECT_BINARY_DIR}/genhdr/moduledefs.h ${CMAKE_CURRENT_SOURCE_DIR}/../micropython/py/mpconfig.h ${CMAKE_CURRENT_SOURCE_DIR}/mpconfigport.h > ${PROJECT_BINARY_DIR}/genhdr/qstr.i.last
+ BYPRODUCTS ${PROJECT_BINARY_DIR}/genhdr/qstr.i.last
+ DEPENDS ${PROJECT_BINARY_DIR}/genhdr/moduledefs.h
+ COMMENT "Generating mpversion.h"
+)
+
 #Retro68 Console library - modififed
 add_library(RetroConsole
     retro/Console.cc
@@ -107,6 +119,7 @@ target_include_directories(MicroPython
 add_dependencies(MicroPython 
 	gen_mpversion
 	gen_moduledefs
+	gen_qstr_i_last		#TODO: make this a dependency of later qstr steps
 	)
 
 target_link_libraries(MicroPython