Nearly there, evaluation doesn't proceed to end though, need to fix