Migrate to S-expressions, wip