Major overhaul - blocks