Blocks are now created in the Factory. Slight refactor changes to make
future updates easier.