Added TODO, formatting