diff --git a/MIT-LICENSE b/MIT-LICENSE
new file mode 100644
index 0000000..690988b
--- /dev/null
+++ b/MIT-LICENSE
@@ -0,0 +1,21 @@
+== MIT License
+
+Copyright (c) 2010 [Eugenio Costa - tutecosta AT google mail]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.textile b/README.textile
index a7ab986..671ed5d 100644
--- a/README.textile
+++ b/README.textile
@@ -9,3 +9,9 @@ I'm currently actively developing it.
 h3. Currently relies on:
 
 * Inflection ('opcion' => 'opciones') (@bootstrap.php@)
+
+Type of questions:
+# Yes / No
+# Values 1 to 5
+# Free text
+# Custom options (developing)
diff --git a/frage.sql b/frage.sql
index f76c418..3149ca7 100644
--- a/frage.sql
+++ b/frage.sql
@@ -31,7 +31,8 @@ CREATE TABLE `fr_encuestas` (
 --
 
 INSERT INTO `fr_encuestas` (`id`, `nombre`) VALUES
-(1, 'About CakePHP plugins');
+(1, 'About CakePHP plugins'),
+(2, 'About frage plugin');
 
 -- --------------------------------------------------------
 
@@ -54,7 +55,9 @@ CREATE TABLE `fr_preguntas` (
 
 INSERT INTO `fr_preguntas` (`id`, `fr_encuesta_id`, `pregunta`, `tipo`) VALUES
 (1, 1, 'Do you use CakePHP plugins?', 1),
-(2, 1, 'How much?', 2);
+(2, 1, 'How much?', 2),
+(3, 1, 'Do you find them better than plain CakePHP? Why?', 3),
+(4, 2, 'Will you help me improving it?', 1);
 
 -- --------------------------------------------------------
 
@@ -76,7 +79,9 @@ CREATE TABLE `fr_opciones` (
 --
 
 INSERT INTO `fr_opciones` (`id`, `fr_pregunta_id`, `opcion`, `tipo`) VALUES
-(1, 0, 'Sí', 1), (2, 0, 'No', 1);
+(1, 0, 'Sí', 1), (2, 0, 'No', 1), -- Yes / No
+(3, 0, 1, 2), (4, 0, 2, 2), (5, 0, 3, 2), (6, 0, 4, 2), (7, 0, 5, 2),  -- 1 to 5
+(8, 0, 'FR_TEXT', 3); -- free text
 
 -- --------------------------------------------------------
 
diff --git a/views/encuestas/index.ctp b/views/encuestas/index.ctp
index 7d1e6fd..1132247 100644
--- a/views/encuestas/index.ctp
+++ b/views/encuestas/index.ctp
@@ -1,3 +1,4 @@
+<div id="frage">
 <h2>Encuestas</h2>
 <ul>
 <?
@@ -6,10 +7,9 @@ foreach ($encuestas as $e) {
 	. $functions->abm($e['Encuesta']['id'], 'encuestas');
 	$functions->listar_preguntas($e['Pregunta']);
 	echo "</li>\n";
-
-	// $functions->show_options(1);
 }
 ?>
 </ul>
 
-<p><a href="/frage/encuestas/add">Nueva encuesta</a></p>
+<p><a href="/frage/encuestas/add">Nueva encuesta</a> - <a href="/frage/preguntas/add">Nueva pregunta</a></p>
+</div>
diff --git a/views/helpers/functions.php b/views/helpers/functions.php
index 5737862..c4cab36 100644
--- a/views/helpers/functions.php
+++ b/views/helpers/functions.php
@@ -15,7 +15,7 @@ function abm($id, $controller, $enclosed = null) {
 		return $abm;
 	}
 
-	function listar_preguntas($pregs) {
+	function listar_preguntas($pregs, $show_options = true) {
 		/* Load HTML helper */
 		App::import('Helper', 'Html');
 		$html = new HtmlHelper();
@@ -24,16 +24,26 @@ function listar_preguntas($pregs) {
 			echo "\n    <ul>\n";
 			foreach ($pregs as $p) {
 				echo '      <li><a href="/frage/preguntas/edit/'.$p['id'].'">' . $p['pregunta'] . "</a> "
-				 . $this->abm($p['id'], 'preguntas') . "</li>\n";
+				 . $this->abm($p['id'], 'preguntas')
+				 . $this->show_options($p['tipo'], $p['id'])
+				 . "</li>\n";
 			}
 			echo '    </ul>';
 		}
 	}
 
-	function show_options($tipo) {
-		pr(ClassRegistry::init('Opcion')->find('all', array(
+	function show_options($tipo, $pid) {
+		$options = ClassRegistry::init('Opcion')->find('all', array(
 			'conditions' => array('Opcion.tipo' => $tipo)
-		)));
+		));
+		$opts = '';
+		foreach ($options as $opt) {
+			if ($tipo == 1 or $tipo == 2)
+				$opts .= "<label><input type=\"radio\" id=\"pr_$pid\" name=\"pr_$pid\" value=\"{$opt['Opcion']['id']}\"> {$opt['Opcion']['opcion']}</label> ";
+			if ($tipo == 3)
+				$opts .= "<label><input type=\"text\" id=\"pr_$pid\" name=\"pr_$pid\"></label> ";
+		}
+		return $opts;
 	}
 
 }