Attempt to add "eval" expressions

Code's currently broken - don't use for anything major
Minor edits for additional functionality