WIP block mode, add some todo notes