Add expand to symbols (heavy wip)