Added TODO, whitespace issues