Stripping out most of the old code
Marking up our AST
Adding dependency on rocambole
Added more tests