INCOMPLETE progress on CTE parser revamp for issue #6