WIP
New blocks handler
New model tweaks