(#39) - Evil eval braking stuff

This is on top of #41.
For discussion see #39.