Blocks are now correctly drawn (I guess thanks to 3c52dfd4c796049d44d0f2e7e2ce726453354d7e), so updated TODO