 
               while question_info.tree is current_tree
                 grid_row+=1
-                switch_question = $('#' + question_info.name + "_field")
+                question_change = $('#' + question_info.name + "_field")
 
                 # First, change the select to a list, then change the options to radio buttons
                 attrs = { }
-                #$.each($('#' + switch_question[0].id + ' select')[0].attributes, (idx, attr) ->
-                #  attrs[attr.nodeName] = attr.value
-                #)
-                #$('#' + switch_question[0].id + ' select').replaceWith( () ->
-                #  return $("<div />", attrs).append($(@).contents()) )
-
-                $('#' + switch_question[0].id + ' option').each( (index) ->
+
+                $('#' + question_change[0].id + ' option').each( (index) ->
                   attrs = { }
                   $.each($(@)[0].attributes, (idx, attr) ->
                     attrs[attr.nodeName] = attr.value
                   )
                   attrs.type = 'radio'
-                  attrs.name = switch_question.data('key')
-                  attrs.id = switch_question.data('key') + '-' + index
+                  attrs.name = question_change.data('key')
+                  attrs.id = question_change.data('key') + '-' + index
                   $(@).replaceWith( () ->
                     return $("<input />", attrs) ) 
                   $('#' + attrs.id)
-                    .appendTo($(switch_question))
+                    .appendTo($(question_change))
                     .wrap('<td class="grid-list-cell" />')
                 )
 
-                $('#' + switch_question[0].id + ' label').wrap('<td class="grid-list-cell" />')
-
-                $('#' + switch_question[0].id + ' .controls').remove()#.attr('display', 'inline-block')
+                $('#' + question_change[0].id + ' label').wrap('<td class="grid-list-cell" />')
+                $('#' + question_change[0].id + ' .controls').remove()
 
                 # Then, move the question into the grid-list as a grid-row
-                switch_question.appendTo($('#' + table_name + ' tbody'))
+                question_change.appendTo($('#' + table_name + ' tbody'))
                 attrs = { }
-                $.each(switch_question[0].attributes, (idx, attr) ->
+                $.each(question_change[0].attributes, (idx, attr) ->
                   attrs[attr.nodeName] = attr.value
                 )
                 attrs.class = "active"
 
-                switch_question
+                question_change
                   .fadeIn(1)
                   .replaceWith( () ->
                     return $("<tr />", attrs).append($(@).contents()) )              


            @_display_form_buttons( question_index )

            console.log(@)

            @

        next_question: () ->

            else if question_index < @input_fields.length
                question_index += 1

            @switch_question( $( '#' + @input_fields[question_index].name + '_field' ), true )

            @

