Need to refactor out some of the parts of the block operation for testing