Added #ifndef and #elif directives.
* Added current goals checklist to TODO.md