Added even more TODO's. More ideas ;-)