Function return hookup almost done (need to handle constants after)