Merged some stuff

Some merging done for the block logistics