THIS COMMIT IS BROKEN! I need to stash something I was working on because I'm losing my computer today. Don't pull this yet! Started work on 'triangle explosions'