Add blocks, fix rotation. Move to electro and blocks