Add some TODO notes and under-construction message
Add some TODO notes