small design changes, need titles and a promiseTracker