perliminary block locking, move some stuff around