readd file that shouldnt have been removed in last commit
clean up some todos