take TODOS out into issues