[WIP] Handle blocks better