diff --git a/.gitignore b/.gitignore
index a1f90b8..4eda716 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,7 @@ config/database.yml
 config/config.yml
 tmp/logs.txt
 *~
+
+/vendor/
+app/models/Base
+app/models/Map
diff --git a/app/controllers/IssueController.php b/app/controllers/IssueController.php
index 0a11043..c8b78a6 100644
--- a/app/controllers/IssueController.php
+++ b/app/controllers/IssueController.php
@@ -1,6 +1,8 @@
 <?php
 
- class IssueController extends ApplicationController {
+use Base\IssueQuery;
+
+class IssueController extends ApplicationController {
 
  	public function newAction() {
 		$entity = new Issue();
@@ -16,9 +18,8 @@ public function editAction() {
 	}
 
 	public function showAction() {
-		$id = $this->request->getParam("id");
-		$ent = load_issue($id);
-		$this->render(array("entity" => $ent));
+		$issue = IssueQuery::create()->findOneById($this->request->getParam("id"));
+		$this->render(array("entity" => $issue));
 	}
 
 	public function createAction() {
@@ -30,8 +31,13 @@ public function indexAction() {
 		$project_id = $this->request->getParam("pid");
 		$per_page = 5;
 		$init = $page * $per_page;
-		$items = list_issue("num desc", $init . "," . $per_page, "project_id = " . $project_id);
-		$total_results = count_issue("project_id = " . $project_id);
+        $items = IssueQuery::create()
+            ->orderByNum(IssueQuery::DESC)
+            ->offset($init)
+            ->limit($per_page)
+            ->filterByProjectId($project_id)
+            ->find();
+		$total_results = IssueQuery::create()->filterByProjectId($project_id)->count();
 		$total_pages = ceil($total_results / $per_page);
 		$this->render(array("issues" => $items, 
 							"pid" => $project_id,
@@ -41,4 +47,4 @@ public function indexAction() {
 	}
 
  }
-?>
\ No newline at end of file
+?>
diff --git a/app/controllers/ProjectController.php b/app/controllers/ProjectController.php
index 3c0983b..2bf2615 100755
--- a/app/controllers/ProjectController.php
+++ b/app/controllers/ProjectController.php
@@ -1,6 +1,9 @@
 <?php
 
- class ProjectController extends ApplicationController {
+use Base\DeveloperQuery;
+use Base\ProjectQuery;
+
+class ProjectController extends ApplicationController {
   private $per_page = 12;
 
    public function searchAction() {
@@ -104,45 +107,43 @@ public function publishAction() {
   }
 
   public function createAction() {
-    $entity = new Project();
+    $project = new Project();
     $proj = $this->request->getParam("project");
 
-    $dev = load_developer_where('name = "' . $this->request->getParam("owner_name").'"');
+    $dev = DeveloperQuery::create()->findOneByName($this->request->getParam("owner_name"));
 
     if($dev == null) { //Create the developer if it's not on our database already
       $dev = new Developer();
-      $dev->name = $this->request->getParam("owner_name");
-      $dev->avatar_url = $this->request->getParam("owner_avatar");
-      save_developer($dev);
+      $dev->setName($this->request->getParam("owner_name"));
+      $dev->setAvatarUrl($this->request->getParam("owner_avatar"));
+      $dev->save();
     } else { //Update the avatar if it changed
-      if ( $dev->avatar_url != $this->request->getParam("owner_avatar")) {
-        $dev->avatar_url = $this->request->getParam("owner_avatar");
-        save_developer($dev);
+      if ( $dev->getAvatarUrl() != $this->request->getParam("owner_avatar")) {
+        $dev->setAvatarUrl($this->request->getParam("owner_avatar"));
+        $dev->save();
       }
     }
 
-    if(!load_project_where("name = '".$proj['name']."' and owner_id = ".$dev->id)) {
-
-      $proj['url'] = str_replace("https", "", $proj['url']);
-      $proj['url'] = str_replace("http", "", $proj['url']);
-      $proj['url'] = str_replace("://", "", $proj['url']);
-      $proj['url'] = "http://" . $proj['url'];
+    if(!ProjectQuery::create()->filterByName($proj['name'])->findOneByOwnerId($dev->getId())) {
+      $projectUrl = $proj['url'];
+      $projectUrl = str_replace("https", "", $projectUrl);
+      $projectUrl = str_replace("http", "", $projectUrl);
+      $projectUrl = str_replace("://", "", $projectUrl);
+      $projectUrl = "http://" . $projectUrl;
 
-      $proj['owner_id'] = $dev->id;
-      $proj['published'] = 1;
-      $entity->load_from_array($proj);
-      if(save_project($entity)) {
+      $project->setUrl($projectUrl)->setDeveloper($dev)->setPublished(true);
+      if($project->save()) {
         //Create the first set of stats
-        $entity->saveInitStats();
-        $entity->grabHistoricData();
+        $project->saveInitStats();
+        $project->grabHistoricData();
         $this->flash->setSuccess("The project was added correctly, thanks!");
-        $this->redirect_to(project_show_path($entity));
+        $this->redirect_to(project_show_path($project));
       } else {
-        $this->render(array("entity" => $entity), "new");
+        $this->render(array("entity" => $project), "new");
       }
     } else {
       $this->flash->setError("This project has already been submited");
-      $this->render(array("entity" => $entity), "new");
+      $this->render(array("entity" => $project), "new");
     }
   }
 
diff --git a/app/controllers/WebSiteMessageController.php b/app/controllers/WebSiteMessageController.php
index e9a340c..970ad3c 100644
--- a/app/controllers/WebSiteMessageController.php
+++ b/app/controllers/WebSiteMessageController.php
@@ -1,6 +1,8 @@
 <?php
 
- class WebSiteMessageController extends ApplicationController {
+use Propel\Runtime\Exception\PropelException;
+
+class WebSiteMessageController extends ApplicationController {
 
   public function newAction() {
     $entity = new WebSiteMessage();
@@ -8,30 +10,30 @@ public function newAction() {
   }
 
   public function deleteAction() {
-    delete_web_site_message($this->request->getParam("id"));
+    WebSiteMessageQuery::create()->findOneById($this->request->getParam("id"))->delete();
     $this->flash->success("Delete successfull!");
     $this->redirect_to(web_site_message_list_path());
   }
 
   public function editAction() {
-    $tb = load_web_site_message($this->request->getParam("id"));
+    $webSiteMessage = WebSiteMessageQuery::create()->findOneById($this->request->getParam("id"));
 
-    $this->render(array("entity" => $tb));
+    $this->render(array("entity" => $webSiteMessage));
   }
 
   public function showAction() {
-    $id = $this->request->getParam("id");
-    $ent = load_web_site_message($id);
-    $this->render(array("entity" => $ent));
+    $webSiteMessage = WebSiteMessageQuery::create()->findOneById($this->request->getParam("id"))
+    $this->render(array("entity" => $webSiteMessage));
   }
 
   public function createAction() {
     $entity = new WebSiteMessage();
-    $entity->load_from_array($this->request->getParam("web_site_message"));
-    if(save_web_site_message($entity)) {
-      $this->flash->setSuccess("Message sent! Thanks for getting in touch!");
-      $this->redirect_to(home_root_path_path());
-    } else {
+    $entity->fromArray($this->request->getParam("web_site_message"));
+    try {
+        $entity->save();
+        $this->flash->setSuccess("Message sent! Thanks for getting in touch!");
+        $this->redirect_to(home_root_path_path());
+    } catch (PropelException $e) {
       $this->flash->setError("Both fields are required, make sure you fill them! And the email must be  valid one.");
       $this->redirect_to(home_root_path_path());
     }
diff --git a/app/models/Developer.php b/app/models/Developer.php
new file mode 100644
index 0000000..804812e
--- /dev/null
+++ b/app/models/Developer.php
@@ -0,0 +1,51 @@
+<?php
+
+use Base\Developer as BaseDeveloper;
+
+
+/**
+ * Skeleton subclass for representing a row from the 'developer' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class Developer extends BaseDeveloper
+{
+    public function avatar()
+    {
+        if ($this->getAvatarUrl() == "") {
+            return "/img/no-avatar.png";
+        } else {
+            return $this->getAvatarUrl();
+        }
+    }
+
+    public function gatherStats()
+    {
+        $db_projects = $this->getProjects(true);
+        $langs = array();
+        $projects = array();
+        foreach ($db_projects as $project) {
+            $projects[] = array(
+                "language" => $project->language,
+                "name" => $project->name,
+                "commits" => $project->countCommits(),
+                "pr_acceptance_rate" => intval($project->pr_acceptance_rate),
+                "stars" => intval($project->stars),
+                "forks" => intval($project->forks),
+                "faq_count" => count($project->getQuestions()),
+                "total_pull_requests" => $project->getTotalPullRequests()
+            );
+        }
+        $stats = array(
+            "owned_projects" => $projects,
+            "contributed_projects" => $this->getMyContributions()
+        );
+
+        return $stats;
+    }
+}
diff --git a/app/models/DeveloperQuery.php b/app/models/DeveloperQuery.php
new file mode 100644
index 0000000..4779b41
--- /dev/null
+++ b/app/models/DeveloperQuery.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\DeveloperQuery as BaseDeveloperQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'developer' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class DeveloperQuery extends BaseDeveloperQuery
+{
+
+} // DeveloperQuery
diff --git a/app/models/Faq.php b/app/models/Faq.php
new file mode 100644
index 0000000..c44ccd9
--- /dev/null
+++ b/app/models/Faq.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\Faq as BaseFaq;
+
+
+/**
+ * Skeleton subclass for representing a row from the 'faq' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class Faq extends BaseFaq
+{
+
+}
diff --git a/app/models/FaqQuery.php b/app/models/FaqQuery.php
new file mode 100644
index 0000000..942b708
--- /dev/null
+++ b/app/models/FaqQuery.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\FaqQuery as BaseFaqQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'faq' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class FaqQuery extends BaseFaqQuery
+{
+
+} // FaqQuery
diff --git a/app/models/Issue.php b/app/models/Issue.php
new file mode 100644
index 0000000..2132da6
--- /dev/null
+++ b/app/models/Issue.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\Issue as BaseIssue;
+
+
+/**
+ * Skeleton subclass for representing a row from the 'issue' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class Issue extends BaseIssue
+{
+
+}
diff --git a/app/models/IssueQuery.php b/app/models/IssueQuery.php
new file mode 100644
index 0000000..9b655d5
--- /dev/null
+++ b/app/models/IssueQuery.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\IssueQuery as BaseIssueQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'issue' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class IssueQuery extends BaseIssueQuery
+{
+
+} // IssueQuery
diff --git a/app/models/Project.php b/app/models/Project.php
new file mode 100644
index 0000000..16eb382
--- /dev/null
+++ b/app/models/Project.php
@@ -0,0 +1,198 @@
+<?php
+
+use Base\Project as BaseProject;
+
+
+/**
+ * Skeleton subclass for representing a row from the 'project' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class Project extends BaseProject
+{
+   	public function url() {
+   		$url = $this->url;
+   		$url = str_replace("https://", "", $url);
+   		$url = str_replace("http://", "", $url);
+   		$url = str_replace("github.com/", "", $url);
+   		$url = str_replace("github.com", "", $url);
+   		return "https://github.com/" . $url;
+   	}
+
+   	public function language() {
+   		return ($this->getLanguage() != "") ? $this->language : "N/A";
+   	}
+
+   	public function saveInitStats() {
+   		Makiavelo::info("===== Saving initial deltas");
+   		$pd = new ProjectDelta();
+   		$pd->forks = $this->forks;
+   		$pd->delta_forks = 0;
+
+   		$pd->open_issues = $this->open_issues;
+   		$pd->closed_issues = $this->closed_issues;
+
+   		$pd->stars = $this->stars;
+   		$pd->delta_stars = 0;
+
+   		$pd->project_id = $this->id;
+   		$pd->sample_date = date("Y-m-d H:i:s");
+
+   		if(save_project_delta($pd)) {
+   			Makiavelo::info("===== Delta saved! ");
+   		} else {
+   			Makiavelo::info("===== ERROR saving delta");
+   		}
+   	}
+
+   	public function getAcceptanceString() {
+   		if($this->pr_acceptance_rate < 30) {
+   			return "terrible";
+   		}
+
+   		if($this->pr_acceptance_rate >= 30 && $this->pr_acceptance_rate < 70) {
+   			return "acceptable";
+   		}
+
+   		if($this->pr_acceptance_rate >= 70) {
+   			return "good";
+   		}
+   	}
+
+   	public function getStats($init = null, $end = null) {
+   		$deltas = list_project_delta("sample_date",null, "project_id = " .$this->id);
+   		return $deltas;
+   	}
+
+   	public function grabHistoricData() {
+   		$proj_name = $this->name;
+   		$usr_name  = $this->owner()->name;
+
+   		Makiavelo::info("==== Querying for $usr_name/$proj_name");
+   		$g_data = GithubAPI::queryProjectData($usr_name, $proj_name);
+
+   		$this->readme = $g_data->readme;
+   		//Makiavelo::puts("Updating project...");
+   		save_project($this);
+
+   		$data = array();
+   		foreach($g_data->commits 	as $commit) {
+   			$commit_date = $commit->commit->committer->date;
+   			$commit_date = explode("T", $commit_date);
+   			$commit_date = $commit_date[0];
+   			$date_idx = intval(str_replace("-", "", $commit_date));
+   			if(!isset($data[$date_idx]) || !isset($data[$date_idx]['commits'])) {
+   				$data[$date_idx] = array("commits" => 1);
+    			} else {
+   				$data[$date_idx]['commits']++;
+    			}
+
+   			$pc = load_project_commit_where("sha = '".$commit->sha."'");
+   			if($pc == null) { //We make sure we haven't yet saved this commit
+   				$project_commit = new ProjectCommit();
+   				$project_commit->project_id = $this->id;
+   				$project_commit->committer  = $commit->committer->login;
+   				$project_commit->commit_message = $commit->commit->message;
+   				$project_commit->sha = $commit->sha;
+   				$project_commit->commit_date = $commit_date;
+
+   				save_project_commit($project_commit);
+   			}
+   		}
+
+   		foreach($g_data->pulls as $pull) {
+   			$created_data = explode("T", $pull->created_at);
+   			$closed_data = explode("T", $pull->closed_at);
+   			$merged_data = explode("T", $pull->merged_at);
+
+   			$created_idx = intval(str_replace("-", "", $created_data[0]));
+   			$merged_idx = intval(str_replace("-", "", $merged_data[0]));
+   			$closed_idx = intval(str_replace("-", "", $closed_data[0]));
+
+   			if(!isset($data[$created_idx]) || !isset($data[$created_idx]['new_pulls'])) {
+   				$data[$created_idx]['new_pulls'] = 1;
+   			} else {
+   				$data[$created_idx]['new_pulls']++;
+   			}
+
+   			if($merged_idx != 0) {
+   				if(!isset($data[$merged_idx]) || !isset($data[$merged_idx]['merged_pulls'])) {
+   					$data[$merged_idx]['merged_pulls'] = 1;
+   				} else {
+   					$data[$merged_idx]['merged_pulls']++;
+   				}
+   			}
+
+   			if($closed_idx != 0) {
+   				if(!isset($data[$closed_idx]) || !isset($data[$closed_idx]['closed_pulls'])) {
+   					$data[$closed_idx]['closed_pulls'] = 1;
+   				} else {
+   					$data[$closed_idx]['closed_pulls']++;
+   				}
+   			}
+   		}
+
+   		foreach($data as $date => $stats) {
+   			$year = substr($date, 0, 4);
+   			$month = substr($date, 4,2);
+   			$day = substr($date, 6,2);
+   			$str_date = $year . "-" . $month . "-" . $day;
+    			$pd = new ProjectDelta();
+   			$pd->forks = -99;
+   			$pd->delta_forks = -99;
+   			$pd->stars = -99;
+   			$pd->delta_stars = -99;
+
+   			$pd->project_id 	= $this->id;
+   			$pd->commits_count 	= isset($stats['commits']) ? $stats['commits'] : 0;
+   			$pd->new_pulls 		= isset($stats['new_pulls']) ? $stats['new_pulls'] : 0;
+   			$pd->closed_pulls 	= isset($stats['closed_pulls']) ? $stats['closed_pulls'] : 0;
+   			$pd->merged_pulls 	= isset($stats['merged_pulls']) ? $stats['merged_pulls'] : 0;
+   			$pd->sample_date 	= $str_date;
+
+   			if(save_project_delta($pd)) {
+   				Makiavelo::info("===== Delta saved! ");
+   			} else {
+   				Makiavelo::info("===== ERROR saving delta::" . mysql_error());
+   			}
+   		}
+
+   		foreach($g_data->open_issues_list as $issue) {
+
+   			$iss = new Issue();
+   			$iss->title = $issue->title;
+   			$iss->body = MarkdownExtra::defaultTransform($issue->body);
+   			$iss->created_at = $issue->created_at;
+   			$iss->updated_at = $issue->updated_at;
+   			$iss->url = $issue->html_url;
+   			$iss->number = $issue->number;
+   			$iss->project_id = $this->id;
+
+   			if(save_issue($iss)) {
+   				Makiavelo::info("===== Issue saved! ");
+   			} else {
+   				Makiavelo::info("===== ERROR saving issue::" . mysql_error());
+   			}
+
+   		}
+   	}
+
+   	public function getQuestions() {
+   		return list_faq("`order`", null, " project_id = " . $this->id);
+   	}
+
+   	//Returns the historic number of pull requests ever made to this project
+   	public function getTotalPullRequests() {
+   		$pds = list_project_delta(null, null, " project_id = " . $this->id);
+   		$total_pr = 0;
+   		foreach($pds as $pd) {
+   			$total_pr += $pd->new_pulls;
+   		}
+   		return $total_pr;
+   	}
+}
diff --git a/app/models/ProjectCommit.php b/app/models/ProjectCommit.php
new file mode 100644
index 0000000..40921e7
--- /dev/null
+++ b/app/models/ProjectCommit.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\ProjectCommit as BaseProjectCommit;
+
+
+/**
+ * Skeleton subclass for representing a row from the 'project_commit' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class ProjectCommit extends BaseProjectCommit
+{
+
+}
diff --git a/app/models/ProjectCommitQuery.php b/app/models/ProjectCommitQuery.php
new file mode 100644
index 0000000..19f504f
--- /dev/null
+++ b/app/models/ProjectCommitQuery.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\ProjectCommitQuery as BaseProjectCommitQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'project_commit' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class ProjectCommitQuery extends BaseProjectCommitQuery
+{
+
+} // ProjectCommitQuery
diff --git a/app/models/ProjectDelta.php b/app/models/ProjectDelta.php
new file mode 100644
index 0000000..9799780
--- /dev/null
+++ b/app/models/ProjectDelta.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\ProjectDelta as BaseProjectDelta;
+
+
+/**
+ * Skeleton subclass for representing a row from the 'project_delta' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class ProjectDelta extends BaseProjectDelta
+{
+
+}
diff --git a/app/models/ProjectDeltaQuery.php b/app/models/ProjectDeltaQuery.php
new file mode 100644
index 0000000..1b94260
--- /dev/null
+++ b/app/models/ProjectDeltaQuery.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\ProjectDeltaQuery as BaseProjectDeltaQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'project_delta' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class ProjectDeltaQuery extends BaseProjectDeltaQuery
+{
+
+} // ProjectDeltaQuery
diff --git a/app/models/ProjectQuery.php b/app/models/ProjectQuery.php
new file mode 100644
index 0000000..57ed1f5
--- /dev/null
+++ b/app/models/ProjectQuery.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\ProjectQuery as BaseProjectQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'project' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class ProjectQuery extends BaseProjectQuery
+{
+
+} // ProjectQuery
diff --git a/app/models/Suscriptor.php b/app/models/Suscriptor.php
new file mode 100644
index 0000000..dde2f7b
--- /dev/null
+++ b/app/models/Suscriptor.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\Suscriptor as BaseSuscriptor;
+
+
+/**
+ * Skeleton subclass for representing a row from the 'suscriptor' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class Suscriptor extends BaseSuscriptor
+{
+
+}
diff --git a/app/models/SuscriptorQuery.php b/app/models/SuscriptorQuery.php
new file mode 100644
index 0000000..93e5595
--- /dev/null
+++ b/app/models/SuscriptorQuery.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\SuscriptorQuery as BaseSuscriptorQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'suscriptor' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class SuscriptorQuery extends BaseSuscriptorQuery
+{
+
+} // SuscriptorQuery
diff --git a/app/models/User.php b/app/models/User.php
new file mode 100644
index 0000000..67dae31
--- /dev/null
+++ b/app/models/User.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\User as BaseUser;
+
+
+/**
+ * Skeleton subclass for representing a row from the 'user' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class User extends BaseUser
+{
+
+}
diff --git a/app/models/UserQuery.php b/app/models/UserQuery.php
new file mode 100644
index 0000000..6bc4ae2
--- /dev/null
+++ b/app/models/UserQuery.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\UserQuery as BaseUserQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'user' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class UserQuery extends BaseUserQuery
+{
+
+} // UserQuery
diff --git a/app/models/WebSiteMessage.php b/app/models/WebSiteMessage.php
new file mode 100644
index 0000000..7232235
--- /dev/null
+++ b/app/models/WebSiteMessage.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\WebSiteMessage as BaseWebSiteMessage;
+
+
+/**
+ * Skeleton subclass for representing a row from the 'web_site_message' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class WebSiteMessage extends BaseWebSiteMessage
+{
+
+}
diff --git a/app/models/WebSiteMessageQuery.php b/app/models/WebSiteMessageQuery.php
new file mode 100644
index 0000000..eb37a09
--- /dev/null
+++ b/app/models/WebSiteMessageQuery.php
@@ -0,0 +1,19 @@
+<?php
+
+use Base\WebSiteMessageQuery as BaseWebSiteMessageQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'web_site_message' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class WebSiteMessageQuery extends BaseWebSiteMessageQuery
+{
+
+} // WebSiteMessageQuery
diff --git a/app/sql/creates/Developer.sql b/app/sql/creates/Developer.sql
deleted file mode 100644
index e6d457e..0000000
--- a/app/sql/creates/Developer.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE `developer` (`id` int  auto_increment,
-`created_at` datetime ,
-`updated_at` datetime ,
-`name` varchar(255) ,
-`avatar_url` varchar(255) ,
-`github_url` varchar(255) ,
- PRIMARY KEY (id) );
\ No newline at end of file
diff --git a/app/sql/creates/Faq.sql b/app/sql/creates/Faq.sql
deleted file mode 100644
index dae22a6..0000000
--- a/app/sql/creates/Faq.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE `faq` (`id` int  auto_increment,
-`created_at` datetime ,
-`updated_at` datetime ,
-`project_id` int ,
-`question` varchar(255) ,
-`answer` text ,
-`order` int ,
- PRIMARY KEY (id) );
\ No newline at end of file
diff --git a/app/sql/creates/Issue.sql b/app/sql/creates/Issue.sql
deleted file mode 100644
index c6a7ca0..0000000
--- a/app/sql/creates/Issue.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE `issue` (`id` int  auto_increment,
-`created_at` datetime ,
-`updated_at` datetime ,
-`title` varchar(255) ,
-`body` text ,
-`num` int ,
-`url` varchar(255) ,
-`project_id` int ,
- PRIMARY KEY (id) );
\ No newline at end of file
diff --git a/app/sql/creates/Project.sql b/app/sql/creates/Project.sql
deleted file mode 100644
index c95f6fe..0000000
--- a/app/sql/creates/Project.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-CREATE TABLE `project` (`id` int  auto_increment,
-`created_at` datetime ,
-`updated_at` datetime ,
-`name` varchar(255) ,
-`url` varchar(255) ,
-`description` text ,
-`owner_id` int ,
-`stars` int ,
-`forks` int ,
-`last_update` datetime ,
- PRIMARY KEY (id) );
\ No newline at end of file
diff --git a/app/sql/creates/ProjectCommit.sql b/app/sql/creates/ProjectCommit.sql
deleted file mode 100644
index e1d6a19..0000000
--- a/app/sql/creates/ProjectCommit.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE `project_commit` (`id` int  auto_increment,
-`created_at` datetime ,
-`updated_at` datetime ,
-`project_id` int ,
-`committer` varchar(255) ,
-`commit_message` text ,
-`sha` varchar(255) ,
- PRIMARY KEY (id) );
\ No newline at end of file
diff --git a/app/sql/creates/ProjectDelta.sql b/app/sql/creates/ProjectDelta.sql
deleted file mode 100644
index 6d2d5ea..0000000
--- a/app/sql/creates/ProjectDelta.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE `project_delta` (`id` int  auto_increment,
-`created_at` datetime ,
-`updated_at` datetime ,
-`sample_date` datetime ,
-`stars` int ,
-`delta_stars` int ,
-`forks` int ,
-`delta_forks` int ,
- PRIMARY KEY (id) );
\ No newline at end of file
diff --git a/app/sql/creates/Suscriptor.sql b/app/sql/creates/Suscriptor.sql
deleted file mode 100644
index e836e5f..0000000
--- a/app/sql/creates/Suscriptor.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE `suscriptor` (`id` int  auto_increment,
-`created_at` datetime ,
-`updated_at` datetime ,
-`email` varchar(255) ,
- PRIMARY KEY (id) );
\ No newline at end of file
diff --git a/app/sql/creates/User.sql b/app/sql/creates/User.sql
deleted file mode 100644
index fafc9ba..0000000
--- a/app/sql/creates/User.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE `user` (`id` int  auto_increment,
-`created_at` datetime ,
-`updated_at` datetime ,
-`username` varchar(255) ,
-`password` varchar(255) ,
-`role` varchar(255) ,
- PRIMARY KEY (id) );
\ No newline at end of file
diff --git a/app/sql/creates/WebSiteMessage.sql b/app/sql/creates/WebSiteMessage.sql
deleted file mode 100644
index 389d647..0000000
--- a/app/sql/creates/WebSiteMessage.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE `web_site_message` (`id` int  auto_increment,
-`created_at` datetime ,
-`updated_at` datetime ,
-`email` varchar(255) ,
-`body` text ,
- PRIMARY KEY (id) );
\ No newline at end of file
diff --git a/app/sql/creates/create_db.sql b/app/sql/creates/create_db.sql
deleted file mode 100644
index 04adb56..0000000
--- a/app/sql/creates/create_db.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE DATABASE `lfpr::_looking_for_pull_requests`
\ No newline at end of file
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..bec7dbd
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,12 @@
+{
+    "name": "deleteman/lfpr",
+    "require": {
+				"propel/propel": "2.0.*@dev"
+    },
+    "authors": [
+        {
+            "name": "Fernando Doglio",
+            "email": "deleteman@gmail.com"
+        }
+    ]
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..6d8030a
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,512 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "88c33e56c5ec041d67d7ac05258b73c8",
+    "packages": [
+        {
+            "name": "propel/propel",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/propelorm/Propel2.git",
+                "reference": "feaf0bbd3135d23c816a6c008a5cefe2a3711f23"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/propelorm/Propel2/zipball/feaf0bbd3135d23c816a6c008a5cefe2a3711f23",
+                "reference": "feaf0bbd3135d23c816a6c008a5cefe2a3711f23",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4",
+                "psr/log": "~1.0",
+                "symfony/config": "~2.2",
+                "symfony/console": "~2.2",
+                "symfony/filesystem": "~2.2",
+                "symfony/finder": "~2.2",
+                "symfony/validator": "~2.2",
+                "symfony/yaml": "~2.2"
+            },
+            "require-dev": {
+                "behat/behat": "~2.4",
+                "monolog/monolog": "~1.3",
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "monolog/monolog": "The recommended logging library to use with Propel."
+            },
+            "bin": [
+                "bin/propel"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Propel": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "William Durand",
+                    "email": "william.durand1@gmail.com"
+                }
+            ],
+            "description": "Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.4",
+            "homepage": "http://www.propelorm.org/",
+            "keywords": [
+                "Active Record",
+                "orm",
+                "persistence"
+            ],
+            "time": "2014-07-26 14:53:12"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Psr\\Log\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2012-12-21 11:40:51"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v2.5.2",
+            "target-dir": "Symfony/Component/Config",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Config.git",
+                "reference": "a31aa8029bcc0b5b85578328050aa70d052e177b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Config/zipball/a31aa8029bcc0b5b85578328050aa70d052e177b",
+                "reference": "a31aa8029bcc0b5b85578328050aa70d052e177b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/filesystem": "~2.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Config\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Config Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-07-09 09:05:48"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v2.5.2",
+            "target-dir": "Symfony/Component/Console",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Console.git",
+                "reference": "386fa63407805959bd2c5fe540294721ad4224c8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/386fa63407805959bd2c5fe540294721ad4224c8",
+                "reference": "386fa63407805959bd2c5fe540294721ad4224c8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Console\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-07-15 14:15:12"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v2.5.2",
+            "target-dir": "Symfony/Component/Filesystem",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Filesystem.git",
+                "reference": "c1309b0ee195ad264a4314435bdaecdfacb8ae9c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/c1309b0ee195ad264a4314435bdaecdfacb8ae9c",
+                "reference": "c1309b0ee195ad264a4314435bdaecdfacb8ae9c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Filesystem Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-07-09 09:05:48"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v2.5.2",
+            "target-dir": "Symfony/Component/Finder",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Finder.git",
+                "reference": "576d8f69feec477067e91b6bd0367c113e76a1a0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Finder/zipball/576d8f69feec477067e91b6bd0367c113e76a1a0",
+                "reference": "576d8f69feec477067e91b6bd0367c113e76a1a0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Finder\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-07-15 14:15:12"
+        },
+        {
+            "name": "symfony/translation",
+            "version": "v2.5.2",
+            "target-dir": "Symfony/Component/Translation",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Translation.git",
+                "reference": "059d57c361043f5a06eb348b9b7554213f9ab8d1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Translation/zipball/059d57c361043f5a06eb348b9b7554213f9ab8d1",
+                "reference": "059d57c361043f5a06eb348b9b7554213f9ab8d1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "symfony/config": "~2.0",
+                "symfony/yaml": "~2.2"
+            },
+            "suggest": {
+                "symfony/config": "",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Translation\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Translation Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-07-15 14:22:44"
+        },
+        {
+            "name": "symfony/validator",
+            "version": "v2.5.2",
+            "target-dir": "Symfony/Component/Validator",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Validator.git",
+                "reference": "8205456fe5cae985094a2e2a7b4352d1cef06a25"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Validator/zipball/8205456fe5cae985094a2e2a7b4352d1cef06a25",
+                "reference": "8205456fe5cae985094a2e2a7b4352d1cef06a25",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/translation": "~2.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "~1.0",
+                "doctrine/cache": "~1.0",
+                "egulias/email-validator": "~1.0",
+                "symfony/config": "~2.2",
+                "symfony/expression-language": "~2.4",
+                "symfony/http-foundation": "~2.1",
+                "symfony/intl": "~2.3",
+                "symfony/property-access": "~2.2",
+                "symfony/yaml": "~2.0"
+            },
+            "suggest": {
+                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+                "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+                "egulias/email-validator": "Strict (RFC compliant) email validation",
+                "symfony/config": "",
+                "symfony/expression-language": "For using the 2.4 Expression validator",
+                "symfony/http-foundation": "",
+                "symfony/intl": "",
+                "symfony/property-access": "For using the 2.4 Validator API",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Validator\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Validator Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-07-15 14:15:12"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.5.2",
+            "target-dir": "Symfony/Component/Yaml",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml.git",
+                "reference": "f868ecdbcc0276b6158dfbf08b9e98ce07f014e1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/f868ecdbcc0276b6158dfbf08b9e98ce07f014e1",
+                "reference": "f868ecdbcc0276b6158dfbf08b9e98ce07f014e1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-07-09 09:05:48"
+        }
+    ],
+    "packages-dev": [
+
+    ],
+    "aliases": [
+
+    ],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "propel/propel": 20
+    },
+    "platform": [
+
+    ],
+    "platform-dev": [
+
+    ]
+}
diff --git a/config/propel.yml b/config/propel.yml
new file mode 100644
index 0000000..2533005
--- /dev/null
+++ b/config/propel.yml
@@ -0,0 +1,23 @@
+propel:
+    paths:
+        projectDir: ./config/
+        schemaDir: ./config/
+        phpDir: ./app/models/
+
+    database:
+        connections:
+            default:
+                adapter: mysql
+                classname: Propel\Runtime\Connection\DebugPDO
+                dsn: mysql:host=%env.LFPR_DB_HOST%;dbname=%env.LFPR_DB_NAME%
+                user: %env.LFPR_DB_USER%
+                password: %env.LFPR_DB_PASSWORD%
+
+    runtime:
+        defaultConnection: default
+
+    generator:
+        defaultConnection: default
+        connections:
+            - default
+
diff --git a/config/schema.xml b/config/schema.xml
new file mode 100644
index 0000000..f2a4683
--- /dev/null
+++ b/config/schema.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<database name="default" defaultIdMethod="native"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="http://xsd.propelorm.org/1.6/database.xsd" >
+    <behavior name="auto_add_pk" />
+
+    <table name="developer">
+        <column name="name" type="varchar" size="255"/>
+        <column name="avatar_url" type="varchar" size="255"/>
+        <column name="github_url" type="varchar" size="255"/>
+
+        <behavior name="timestampable" />
+    </table>
+
+    <table name="project">
+        <column name="name" type="varchar" size="255"/>
+        <column name="url" type="varchar" size="255"/>
+        <column name="description" type="longvarchar"/>
+        <column name="owner_id" type="integer" required="true"/>
+        <column name="stars" type="integer"/>
+        <column name="forks" type="integer"/>
+        <column name="last_update" type="timestamp"/>
+        <column name="published" type="boolean"/>
+        <column name="language" type="varchar" size="255"/>
+        <column name="open_issues" type="integer"/>
+        <column name="closed_issues" type="integer"/>
+        <column name="readme" type="longvarchar"/>
+        <column name="pr_acceptance_rate" type="integer"/>
+
+        <foreign-key foreignTable="developer">
+            <reference local="owner_id" foreign="id"/>
+        </foreign-key>
+    </table>
+
+    <table name="project_commit">
+        <column name="project_id" type="integer" required="true"/>
+        <column name="committer" type="varchar" size="255"/>
+        <column name="commit_message" type="longvarchar"/>
+        <column name="sha" type="varchar" size="255"/>
+
+        <foreign-key foreignTable="project">
+            <reference local="project_id" foreign="id"/>
+        </foreign-key>
+    </table>
+
+    <table name="project_delta">
+        <column name="sample_date" type="timestamp"/>
+        <column name="stars" type="integer"/>
+        <column name="delta_stars" type="integer"/>
+        <column name="forks" type="integer"/>
+        <column name="delta_forks" type="integer"/>
+    </table>
+
+    <table name="suscriptor">
+        <column name="email" type="varchar" size="255"/>
+    </table>
+
+    <table name="user">
+        <column name="username" type="varchar" size="255"/>
+        <column name="password" type="varchar" size="255"/>
+        <column name="role" type="varchar" size="255"/>
+    </table>
+
+    <table name="web_site_message">
+        <column name="email" type="varchar" size="255"/>
+        <column name="body" type="longvarchar"/>
+    </table>
+
+    <table name="faq">
+        <column name="project_id" type="integer" required="true"/>
+        <column name="question" type="varchar" size="255"/>
+        <column name="answer" type="longvarchar"/>
+        <column name="order" type="integer"/>
+
+        <foreign-key foreignTable="project">
+            <reference local="project_id" foreign="id"/>
+        </foreign-key>
+
+        <behavior name="timestampable" />
+    </table>
+
+    <table name="issue">
+        <column name="project_id" type="integer" required="true"/>
+        <column name="title" type="varchar" size="255"/>
+        <column name="body" type="longvarchar"/>
+        <column name="num" type="integer"/>
+        <column name="url" type="varchar" size="255"/>
+
+        <foreign-key foreignTable="project">
+            <reference local="project_id" foreign="id"/>
+        </foreign-key>
+
+        <behavior name="timestampable" />
+    </table>
+</database>
diff --git a/public/bootstrap.php b/public/bootstrap.php
index b08ad57..f717a26 100644
--- a/public/bootstrap.php
+++ b/public/bootstrap.php
@@ -1,6 +1,8 @@
 <?php
 set_time_limit(0);
 
+require __DIR__ . '/../vendor/autoload.php';
+
 function __autoload_core($class) {
 	try {
 		$path = dirname(__FILE__)."/../core/" . $class . "Class.php";
@@ -96,4 +98,4 @@ function __autoload_lib($class) {
 
 
 
-?>
\ No newline at end of file
+?>
diff --git a/readme.md b/readme.md
index e51acad..b62b36e 100644
--- a/readme.md
+++ b/readme.md
@@ -34,10 +34,9 @@ If you're planning on cloning the site and running it locally, follow these simp
 1. Clone the repo
 2. Create a `tmp` directory on the project directory (and make sure it's writable by apache)
 3. `$ cp config/config{.base,}.yml && cp config/database{.base,}.yml`
-4. Run ./makiavelo.php db:create
-5. Run ./makiavelo.php db:load
-6. Run ./makiavelo.php db:migrate
-7. Configure a virtual host, with the following information
+4. Run `vendor/bin/propel build --input-dir=config -vvv`
+5. Run `vendor/bin/propel insert-sql --input-dir=config -vvv`
+6. Configure a virtual host, with the following information
 ```
 <VirtualHost *:80>
     ServerAdmin webmaster@dummy-host2.example.com