WIP: Updates to CONESTA.