Created some TODOS