Added more TODO and "think about it"´s