TODO, some tiding