Add first version of block selection