Removed calls to eval, now uses inspect to pull the proper function