Started on TODO list in README