More work toward the dust block functionality.