Rewriting the main game code. Sure, it will take a bit of time, but this way the cells auto detect their neighbors using simple colliders and raycasts, which will ultimately allow for multiple different shapes and layouts.. Already got all of that coded and have pieces dropping into place. Now I’m just rewriting the code for shuffling, picking pieces etc. Most of it will be pretty simple to redo and a lot will be copied and pasted from the original. However the original was getting to be some really severe, not quite spaghetti code, but it was all disorganized and thrashed together. This will be much more organized and will aid me in a lot of ways.