Add block initializer. Move stuff around.