[WIP] Refactor AST Walker