Added TODO + changelog