Adding Jamel codebase from March 2013