Feature/multiblock rebased

API and backend changes to support the multi-block API