Added Functor capability

Readded function that disappeared