Added back export code, commenting out ex-3 for now
Added back test cases
Experimental changes