Updated todo list and added basic block