           new_width_percentage = ((next_index / @numberOfQuestions) * 100).toString()
           @$('.progress-bar').width("#{new_width_percentage}%")
 
-        next_question: () ->
-
-            #currentQuestion = document.repo.children[@currentQuestionIndex]
-
-            # Set up for field lists and grid lists
-            # if question.info.control and question.info.control.appearance
-            #     current_tree = question.info.tree
-            #     question_index += 1
-            #     question_index += 1  while @input_fields[question_index].tree is current_tree
-
-            # Attempt to switch to the next question
-            #if question_index < @input_fields.length
-            #    question_index += 1
-
-            @switch_question( @currentQuestionIndex + 1, true )
-
-            @
+        next_question: ->
+          @switch_question( @currentQuestionIndex + 1, true )
+          @
 
         prev_question: () ->
-
-            # question = @_active_question()
-
-            # if question_index <= 0
-            #     return @
-
-            # current_tree = @input_fields[question_index - 1].tree
-
-            # # If we are in a group, check if we are in a field/grid list group
-            # unless current_tree is "/"
-            #   temp_idx = question_index - 1
-            #   temp_idx -= 1  while temp_idx >= 0 and @input_fields[temp_idx].tree is current_tree
-            #   temp_idx += 1
-            #   if @input_fields[temp_idx].control and @input_fields[temp_idx].control.appearance
-            #     question_index = temp_idx
-            #   else
-            #     question_index -= 1
-            # else
-            #   question_index -= 1
-
             @switch_question( @currentQuestionIndex - 1, false )
-
             @
 
     return xFormView


        switch_question: ( next_index, advancing ) ->
          #TODO: if in group, test relevance/constraint for all children

          next_index = 0 if next_index < 0

          # Does the current active question pass our constraints?
          if advancing
            return unless @passes_question_constraints()

          current_question = document.flat_fields[@currentQuestionIndex]
          return if not current_question

          if current_question.type is 'group' and next_index isnt -1
            #TODO: check if group is field-list or not first
            if advancing
              next_index = next_index + current_question.children.length

          next_question = document.flat_fields[next_index]
          if not advancing
            #is current question within group
            group = @get_group_for_question(next_question)
            if group
              next_index = next_index - group.children.length
              next_question = document.flat_fields[next_index]

          if not next_question
            @update_progress_bar(next_index)
            @_display_form_buttons(next_index)
            return

          #Is this question relevant?  Or, is this question an equation?
          if (next_question.bind and next_question.bind.calculate != null) or not
            XFormConstraintChecker.isRelevant( next_question, @queryStringToJSON($( ".form" ).serialize()) )
              # If its a calculation, calculate it!
              $("#" + next_question.name).val _performCalcluate(next_question.bind.calculate)  if next_question.bind and next_question.bind.calculate

              # Switch to the next question!
              if advancing

              @switch_question( next_index, advancing )
              return

          # We've found the next question, so hide the current question, show
          # the next one, and update the controls.
          @hide_question current_question
          @show_question next_question
          @currentQuestionIndex = next_index
          @update_progress_bar(next_index)
          @_display_form_buttons(@currentQuestionIndex)

          #Start the Geopoint display if geopoint
