sort things & clean up & add todos