Slightly smarter eval

Commented out old evaluation method(we should really clean that up)
Using helper methof eval()
Probably inefficient, but it's the smartest we have so far