diff --git a/tools/cleanroom/jons_attempt.txt b/tools/cleanroom/jons_attempt.txt
index b315b97b..8271c77b 100644
--- a/tools/cleanroom/jons_attempt.txt
+++ b/tools/cleanroom/jons_attempt.txt
@@ -1,278 +1,146 @@
 SP_FACE2		64	128
-COMPTALL		256	128
-FIREMAG3		128	128
-WOODGARG		64	128
-GRAYDANG		64	128
-   SFALL		64	128
-DOORRED2		16	128
- DBRAIN1		64	32
-SKSPINE2		256	96
-MIDBRONZ		64	128
-SKSPINE1		128	128
-ZZZFACE9		256	128
-ZZZFACE4		256	128
-SW2GSTON		64	128
-ZZZFACE8		256	128
-PANCASE2		64	128
- SILVER1		64	128
- SILVER3		64	128
- LITERED		16	128
- BSTONE1		64	128
- BSTONE3		64	128
- BSTONE2		64	128
- ZIMMER7		64	128
- ZIMMER1		64	128
- ZIMMER2		64	128
- ZIMMER3		64	128
-TEKBRON2		64	128
- ZIMMER5		64	128
- ZIMMER4		64	128
-REDWALL1		128	128
-CRACKLE4		64	128
-CRACKLE2		64	128
-COMPUTE2		256	56
-COMPUTE3		128	128
-  BRICK7		64	128
-  BRICK1		64	128
-  BRICK3		64	128
-  BRICK2		64	128
-LITEBLU1		8	128
-LITEBLU3		16	128
-LITEBLU2		16	72
- SPACEW2		64	128
- SPACEW4		64	128
+SW1STONE		128	128
+ SW2EXIT		32	72
+ZZZFACE3		256	128
  SW2COMP		64	128
- SW2COMM		64	72
-  CRATE1		64	128
+MARBLOD1		128	128
+ LITEMET		128	128
+ICKWALL6		64	128
+NUKESLAD		64	128
+GRAYDANG		64	128
+WOODGARG		64	128
+COMPTALL		256	128
+   SFALL		64	128
+STARTAN3		128	128
+TEKGREN5		64	128
+TEKGREN4		64	128
+TEKGREN1		64	128
+  SW1ZIM		64	128
+DOORTRAK		8	128
+  NUKE24		64	24
+ SW2MOD1		64	128
+ BROVINE		256	128
+*	  W107_1		0	0
+ SW2LION		64	128
+BRICKLIT		64	128
+ BRNBIGR		32	128
+COMPOHSO		128	128
+PANBORD2		16	128
+   WOOD4		64	128
+   WOOD1		256	128
+ SILVER2		64	128
+ICKWALL4		64	128
+ DBRAIN3		64	32
+TEKBRON2		64	128
+CRACKLE2		64	128
+ SW1ROCK		64	128
+ DBRAIN2		64	32
+ DBRAIN4		64	32
+NUKEPOIS		128	128
+MODWALL2		64	128
+MODWALL3		64	128
+ICKWALL2		64	128
+ICKWALL3		64	128
+MODWALL4		64	128
+   GRAY2		64	72
+MODWALL1		64	128
+ICKWALL1		64	128
   CRATE3		64	128
+   GRAY4		64	128
  SPACEW3		64	128
    GRAY5		64	128
-   GRAY4		64	128
    GRAY7		256	128
-   WOOD9		64	128
-   GRAY1		64	128
-   WOOD8		64	128
-SKINMET2		256	128
-   DOOR3		64	72
- PLANET1		256	128
-   DOOR1		64	72
- BRNPOIS		128	128
-BRNSMALL		32	64
- SW2WOOD		64	128
-BRNSMALR		32	64
- SW1COMM		64	72
-GRAYTALL		128	128
-EXITSIGN		64	16
-STARTAN1		64	128
+  STONE5		64	128
+   LOGO5		64	128
+   LOGO4		256	128
+SW2SATYR		64	128
+  STUCCO		64	128
+  PANRED		64	128
+COMPSTA2		128	128
+ SW2ROCK		64	128
+BIGDOOR6		128	112
+*	DOOR11_1		-48	0
+*	DOOR11_1		32	0
+*	DOOR11_1		5	0
+ SW1SKIN		64	128
  BLODGR3		32	128
   WFALL3		64	128
- SW1SKIN		64	128
-  WFALL2		64	128
+STARTAN1		64	128
+MIDVINE1		256	128
+SW1SATYR		64	128
+SW2WDMET		64	128
+SW2STON6		64	128
+  SW2CMT		64	128
+SKINEDGE		128	128
+SW2STON2		128	128
+SW2STON1		64	128
+LITESTON		64	128
+SP_ROCK1		128	128
+SW1STARG		128	128
+  SFALL2		64	128
+SP_DUDE7		128	128
+  SFALL3		64	128
+ ZIMMER8		64	128
 BIGDOOR1		128	96
 *	   W13_1		0	0
 *	   W13_1		0	24
 *	   W13_1		64	0
 *	   W13_1		64	24
 *	 DOOR2_1		16	0
-BIGDOOR6		128	112
-BIGDOOR7		128	128
-BIGDOOR4		128	128
-BIGDOOR3		128	128
- GLASS2B		64	96
-   LITE3		32	128
- MARBLE1		128	128
- SW1LION		64	128
-   LITE2		64	128
-   LITE4		16	128
- MARBLE2		128	128
- SW1BRN1		128	128
- SW1MARB		64	128
- SW1BRN2		64	128
-STARTAN3		128	128
-STARTAN2		128	128
+  WFALL2		64	128
+EXITSIGN		64	16
+   WOOD8		64	128
+ PLANET1		256	128
+   WOOD9		64	128
+   GRAY1		64	128
+   DOOR1		64	72
+ BRNPOIS		128	128
+*	WALL62_2		0	0
+*	WALL62_2		64	0
+*	  PS20A0		0	60
+ GSTLION		64	128
+NUKEDGE1		128	128
+ GRAYBIG		128	128
+STONGARG		128	128
+ SP_HOT1		256	128
+  SW1HOT		64	128
+SW2STONE		128	128
+ROCKRED1		128	128
+SW1STON1		64	128
+COMPBLUE		64	128
+   WOOD5		256	128
+   WOOD7		64	128
+FIRELAVA		128	128
    WOOD3		256	128
    WOOD6		64	128
-   WOOD7		64	128
-   WOOD5		256	128
-   WOOD1		256	128
-   WOOD4		64	128
- SILVER2		64	128
-EXITDOOR		128	72
- PANBOOK		64	128
- ZELDOOR		128	128
-SW1STON2		128	128
-SW1STON6		64	128
-ROCKRED1		128	128
-COMPBLUE		64	128
-SW1STON1		64	128
- GSTLION		64	128
-STONGARG		128	128
- GRAYBIG		128	128
- SW1ROCK		64	128
-NUKEPOIS		128	128
- DBRAIN4		64	32
- DBRAIN3		64	32
- DBRAIN2		64	32
-SW1STONE		128	128
-ZZZFACE3		256	128
- SW2EXIT		32	72
-COMPUTE1		128	128
- SW1PIPE		128	128
-TANROCK8		64	128
- SW1EXIT		32	72
-   PIPE4		256	128
-   PIPE6		256	128
-   PIPE2		256	128
-TANROCK4		64	128
-SP_FACE1		128	96
- CRATINY		64	16
- SW1BLUE		64	128
- SW1BRIK		64	128
-SW2METAL		64	128
-SKINTEK1		256	128
- SW1MET2		64	128
-  CRATE2		64	128
-SUPPORT3		64	128
-SKINTEK2		256	128
-BRNSMAL2		64	64
-BRNSMAL1		64	64
-SW1STARG		128	128
-LITESTON		64	128
- ZIMMER8		64	128
-SP_DUDE7		128	128
-SKULWAL3		128	128
-SKULWALL		128	128
-AASTINKY		32	72
-*	WALL00_3		0	0
-*	WALL00_3		12	0
-*	WALL00_3		24	0
-FIRELAV3		128	128
-FIRELAV2		128	128
-  STONE3		128	128
-  STONE2		128	128
-  STONE7		64	128
-  STONE6		64	128
- MIDBRN1		64	112
-  STONE4		64	128
-ICKWALL1		64	128
-ICKWALL3		64	128
-ICKWALL2		64	128
-ICKWALL5		64	128
-ICKWALL4		64	128
-ICKWALL7		64	128
-BROWNPIP		128	128
-FIRELAVA		128	128
-  SW1HOT		64	128
- SP_HOT1		256	128
-SW2STONE		128	128
-MODWALL1		64	128
-MODWALL2		64	128
-MODWALL3		64	128
-MODWALL4		64	128
-   GRAY2		64	72
-NUKEDGE1		128	128
-SP_ROCK1		128	128
-  SFALL2		64	128
-  SFALL3		64	128
-  SFALL1		64	128
-  SFALL4		64	128
-TEKGREN2		64	128
-TEKGREN3		64	128
-TEKGREN1		64	128
-TEKGREN4		64	128
-TEKGREN5		64	128
-  METAL5		64	128
-  METAL4		64	128
-  METAL7		64	128
-  METAL6		64	128
-  METAL1		64	128
-  METAL3		64	128
-  METAL2		64	128
-ZZWOLF13		128	128
-ZZWOLF12		128	128
-ZZWOLF11		128	128
-ZZWOLF10		128	128
- SK_LEFT		64	128
-  BFALL4		64	128
-  BFALL1		64	128
-BIGBRIK3		64	128
-  BFALL3		64	128
-BIGBRIK1		64	128
-  SW2TEK		64	128
-BRNPOIS2		64	128
-   ROCK4		128	128
-   ROCK5		128	128
- SW2BRIK		64	128
-   ROCK1		64	128
-   ROCK2		64	128
-   ROCK3		64	128
-SW2STON2		128	128
-SW2STON1		64	128
-SW2STON6		64	128
-  SW2CMT		64	128
-SKINEDGE		128	128
- SKINLOW		256	104
- PANBLUE		64	128
-BIGDOOR2		128	128
- SW1VINE		64	128
-FIREWALA		128	112
-FIREWALB		128	112
-FIREWALL		128	112
-EXITSTON		64	128
-   SKIN2		128	128
-CRATELIT		64	128
-DOORBLU2		16	128
- SW2SLAD		64	128
-  STONE5		64	128
-   LOGO4		256	128
-   LOGO5		64	128
  SW1MOD1		64	128
- BRICK12		64	128
- BRICK11		64	128
  BRICK10		64	128
-MARBLOD1		128	128
-NUKESLAD		64	128
- LITEMET		128	128
-ICKWALL6		64	128
-  PANRED		64	128
-  STUCCO		64	128
-SW2SATYR		64	128
-COMPSTA2		128	128
- SW2ROCK		64	128
+ BRICK11		64	128
+ BRICK12		64	128
+DOORRED2		16	128
+SKSPINE2		256	96
+ICKWALL5		64	128
+BROWNPIP		128	128
+ICKWALL7		64	128
 MIDVINE2		256	128
-MIDVINE1		256	128
-SW1SATYR		64	128
-SW2WDMET		64	128
- BRONZE4		64	128
- BRONZE3		64	128
- BRONZE2		64	128
- BRONZE1		64	128
-COMPSTA1		128	128
- SW2GRAY		64	128
-SW1STRTN		64	128
- TEKLITE		64	128
-MARBGRAY		64	128
- SW2BRN1		128	128
- SW2BRN2		64	128
-SLADPOIS		64	128
- SW1SLAD		64	128
- SW2VINE		64	128
-   COMP2		256	128
-  SW1ZIM		64	128
- SW2MOD1		64	128
-DOORTRAK		8	128
-  NUKE24		64	24
 SKINFACE		256	128
+ SW2GRAY		64	128
+COMPSTA1		128	128
+SW1STRTN		64	128
+ SPACEW4		64	128
+LITEBLU2		16	72
+  CRATE1		64	128
+ SPACEW2		64	128
+ SW2COMM		64	72
+ GLASS2B		64	96
+ SW1LION		64	128
+ MARBLE1		128	128
+   LITE3		32	128
+BIGDOOR3		128	128
+SW1BROWN		128	128
 SUPPORT2		64	128
  BRNBIGL		32	128
  BRNBIGC		128	128
-SW1BROWN		128	128
-COMPOHSO		128	128
- BRNBIGR		32	128
- BROVINE		256	128
- SW2LION		64	128
-BRICKLIT		64	128
-PANBORD2		16	128
  CEMPOIS		128	128
 PANBORD1		32	128
 BLODRIP4		32	128
@@ -469,6 +337,8 @@ PIPEWAL2		64	128
 COMPTILE		128	128
 PIPEWAL1		64	128
   BRICK5		128	128
+*	   RW5_3		0	0
+*	   RW5_4		64	0
 BIGDOOR5		128	128
 *	WALL40_1		0	0
 *	WALL42_3		0	0
@@ -507,3 +377,146 @@ SP_DUDE3		64	128
  SW2DIRT		64	128
  SW2BLUE		64	128
 MIDGRATE		128	128
+   LITE4		16	128
+   LITE2		64	128
+ SW1BRN1		128	128
+ MARBLE2		128	128
+  STONE4		64	128
+  STONE6		64	128
+  STONE7		64	128
+ MIDBRN1		64	112
+SKULWAL3		128	128
+SKULWALL		128	128
+AASTINKY		32	72
+*	WALL00_3		0	0
+*	WALL00_3		12	0
+*	WALL00_3		24	0
+BRNSMAL2		64	64
+BRNSMAL1		64	64
+  METAL4		64	128
+  METAL7		64	128
+  METAL5		64	128
+ZZZFACE8		256	128
+ SILVER3		64	128
+ LITERED		16	128
+ SILVER1		64	128
+ZZZFACE4		256	128
+PANCASE2		64	128
+SW2GSTON		64	128
+SKINTEK2		256	128
+  CRATE2		64	128
+SUPPORT3		64	128
+ SW1MET2		64	128
+  BRICK1		64	128
+  BRICK3		64	128
+COMPUTE3		128	128
+  BRICK7		64	128
+LITEBLU3		16	128
+  BRICK2		64	128
+LITEBLU1		8	128
+FIRELAV3		128	128
+FIRELAV2		128	128
+  STONE2		128	128
+  STONE3		128	128
+ ZIMMER3		64	128
+ ZIMMER1		64	128
+ BSTONE2		64	128
+ BSTONE3		64	128
+ BSTONE1		64	128
+ ZIMMER2		64	128
+ ZIMMER7		64	128
+   PIPE6		256	128
+ CRATINY		64	16
+   PIPE2		256	128
+TANROCK4		64	128
+SP_FACE1		128	96
+   PIPE4		256	128
+SW1STON6		64	128
+ PANBOOK		64	128
+EXITDOOR		128	72
+ ZELDOOR		128	128
+SW1STON2		128	128
+TEKGREN2		64	128
+  SFALL4		64	128
+TEKGREN3		64	128
+  SFALL1		64	128
+ SW1BRIK		64	128
+ SW1BLUE		64	128
+SW2METAL		64	128
+SKINTEK1		256	128
+  METAL2		64	128
+ZZWOLF13		128	128
+  METAL6		64	128
+  METAL3		64	128
+  METAL1		64	128
+BIGDOOR7		128	128
+*	  W105_1		123	0
+*	  W105_1		-5	0
+BIGDOOR4		128	128
+ SW2SLAD		64	128
+CRATELIT		64	128
+   SKIN2		128	128
+DOORBLU2		16	128
+ SKINLOW		256	104
+ PANBLUE		64	128
+BIGDOOR2		128	128
+   ROCK3		64	128
+MARBGRAY		64	128
+ SW2BRN1		128	128
+ TEKLITE		64	128
+TANROCK8		64	128
+ZZWOLF10		128	128
+ SK_LEFT		64	128
+ZZWOLF12		128	128
+ SW1EXIT		32	72
+ SW1PIPE		128	128
+COMPUTE1		128	128
+BIGBRIK3		64	128
+   ROCK2		64	128
+   ROCK1		64	128
+  BFALL1		64	128
+REDWALL1		128	128
+ ZIMMER5		64	128
+COMPUTE2		256	56
+CRACKLE4		64	128
+SKINMET2		256	128
+ ZIMMER4		64	128
+   DOOR3		64	72
+FIREWALA		128	112
+FIREWALB		128	112
+ SW1VINE		64	128
+EXITSTON		64	128
+FIREWALL		128	112
+ SW2BRIK		64	128
+  SW2TEK		64	128
+   ROCK4		128	128
+   ROCK5		128	128
+ZZWOLF11		128	128
+BIGBRIK1		64	128
+BRNPOIS2		64	128
+*	WALL62_1		0	0
+*	  PS20A0		0	56
+ SW1MARB		64	128
+ SW1BRN2		64	128
+ SW2WOOD		64	128
+GRAYTALL		128	128
+STARTAN2		128	128
+ DBRAIN1		64	32
+SKSPINE1		128	128
+ZZZFACE9		256	128
+MIDBRONZ		64	128
+FIREMAG3		128	128
+ BRONZE2		64	128
+ BRONZE3		64	128
+ BRONZE1		64	128
+ BRONZE4		64	128
+BRNSMALR		32	64
+ SW1COMM		64	72
+  BFALL4		64	128
+  BFALL3		64	128
+BRNSMALL		32	64
+ SW2VINE		64	128
+   COMP2		256	128
+ SW2BRN2		64	128
+ SW1SLAD		64	128
+SLADPOIS		64	128