wip
change from qi to x3. change AST structure