Initial work done in July 2014 dojo by Kiran and Omid