WIP: Wrap up expect syntax