TODO's solved