Modified by adding TODO statements, Status Pending.

Signed-off-by: Sanjay Madnani <http://sanjaymadnani.wordpress.com/>