added two classes to make functions callable in places values are requested, and added a more general return', also changed auto to new