TODO items

Feel free to reject if you disagree/don't like it.