Beginning to switch to FreeT parsing