Removed TBDs from code to move into a google doc : http://goo.gl/pHwNyl