Added comments marking TODO items