More on the TODO list. ._.