Fix todo
Working on the todos