Added more info and TODOs