TODO: added list of things to do