Extended eval a little, refactored to use reader in testing. Still need to test eval.