Attempting to get evaluation working
Improved Evaluation for Functions