Working through adding Block generation back into new structure.