Adding more todo items and stuff to investigate. More questions than
answers.