Added TODO
Enable spelling check