Add eval. Tidy up.