Added more thoughts, todo