Woohoo! Today I learned a number of new design patterns using partial classes, nested classes, interfaces, singletons, and single-instance classes. I thoroughly enjoyed figuring this out and getting it to work. Now that I've got the vision in place, it's easier to see how to go forward and how to add additional abilities and functions to the new architecture. The next task is to pull the block creation code out and pipe that back in as well. Right now I think it's actually possible to merge with the main branch of the repository.