TODOs and more info on running