diff --git a/www/application/config/config.php b/www/application/config/config.php
index 1031522..24bf583 100755
--- a/www/application/config/config.php
+++ b/www/application/config/config.php
@@ -23,7 +23,7 @@
 | a PHP script and you can easily do that on your own.
 |
 */
-$config['base_url'] = '';
+$config['base_url'] = 'http://twitter-clone.lndo.site/';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/www/application/config/routes.php b/www/application/config/routes.php
index 93e31e8..9ada1d1 100755
--- a/www/application/config/routes.php
+++ b/www/application/config/routes.php
@@ -49,5 +49,5 @@
 | Examples:	my-controller/index	-> my_controller/index
 |		my-controller/my-method	-> my_controller/my_method
 */
-$route['default_controller'] = 'pages/view';
-$route['(:any)'] = 'pages/view/$1';
+//$route['default_controller'] = 'pages/view';
+//$route['(:any)'] = 'pages/view/$1';
diff --git a/www/application/controllers/Form.php b/www/application/controllers/Form.php
deleted file mode 100644
index 59714a8..0000000
--- a/www/application/controllers/Form.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class Form extends CI_Controller {
-  public function index(){
-    $this->load->helper(array('form', 'url'));
-
-    $this->load->library('form_validation');
-
-    if ($this->form_validation->run() == FALSE)
-      $this->load->view('register');
-    else
-      $this->load->view('register_success')
-  }
-}
diff --git a/www/application/controllers/Login.php b/www/application/controllers/Login.php
new file mode 100644
index 0000000..eaa8137
--- /dev/null
+++ b/www/application/controllers/Login.php
@@ -0,0 +1,21 @@
+<?php
+
+class Login extends CI_Controller {
+  public function index(){
+    $this->load->helper(array('form', 'url'));
+
+    $this->load->library('form_validation');
+
+    $this->form_validation->set_rules('username', 'Username', 'required');
+    $this->form_validation->set_rules('password', 'Password', 'required');
+
+    if ($this->form_validation->run() == FALSE)
+      $this->load->view('login');
+
+    // load the homepage if login successful
+    // https://www.codeigniter.com/user_guide/libraries/form_validation.html#callbacks-your-own-validation-methods
+    else {
+      $this->load->view('formsuccess');
+    }
+  }
+}
diff --git a/www/application/controllers/Pages.php b/www/application/controllers/Pages.php
deleted file mode 100644
index f0609c0..0000000
--- a/www/application/controllers/Pages.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-class Pages extends CI_Controller {
-
-  public function view($page = 'home'){
-    if(!file_exists(APPPATH.'views/pages/'.$page.'.php'))
-      show_404();
-
-    $data['title'] = ucfirst($page);
-
-    $this->load->view('templates/header', $data);
-    $this->load->view('pages/'.$page, $data);
-    $this->load->view('templates/footer', $data);
-  }
-}
diff --git a/www/application/controllers/Register.php b/www/application/controllers/Register.php
new file mode 100644
index 0000000..7ff25a4
--- /dev/null
+++ b/www/application/controllers/Register.php
@@ -0,0 +1,27 @@
+<?php
+
+class Register extends CI_Controller {
+  public function index(){
+    $this->load->helper(array('form', 'url'));
+
+    $this->load->library('form_validation');
+
+    $this->form_validation->set_rules('name', 'Name', 'required');
+    $this->form_validation->set_rules('email', 'Email', 'required');
+    $this->form_validation->set_rules('username', 'Username', 'required');
+    $this->form_validation->set_rules('password', 'Password', 'required',
+            array('required' => 'You must provide a %s.'));
+    $this->form_validation->set_rules('email', 'Email', 'required');
+
+    $this->form_validation->set_rules('email', 'Email', 'required|valid_email');
+
+    if ($this->form_validation->run() == FALSE)
+      $this->load->view('register');
+
+    // load the homepage once properly submitted
+    // https://www.codeigniter.com/user_guide/libraries/form_validation.html#callbacks-your-own-validation-methods
+    else {
+      $this->load->view('formsuccess');
+    }
+  }
+}
diff --git a/www/application/views/pages/register_success.php b/www/application/views/formsuccess.php
similarity index 100%
rename from www/application/views/pages/register_success.php
rename to www/application/views/formsuccess.php
diff --git a/www/application/views/pages/home.php b/www/application/views/home.php
similarity index 100%
rename from www/application/views/pages/home.php
rename to www/application/views/home.php
diff --git a/www/application/views/login.php b/www/application/views/login.php
new file mode 100644
index 0000000..980e239
--- /dev/null
+++ b/www/application/views/login.php
@@ -0,0 +1,17 @@
+<?php
+  $this->load->library('form_validation');
+  echo validation_errors();
+  echo form_open('login'); ?>
+
+  <h5>Username</h5>
+  <input type="text" name="username" value="<?php echo set_value('username'); ?>" size="50" />
+  <?php echo form_error('username'); ?>
+
+  <h5>Password</h5>
+  <input type="password" name="password" value="<?php echo set_value('password'); ?>" size="50" />
+  <?php echo form_error('password'); ?>
+
+  <br><br>
+  <div><input type="submit" value="Submit"/></div>
+
+  </form>
diff --git a/www/application/views/pages/login.php b/www/application/views/pages/login.php
deleted file mode 100644
index 829e8bb..0000000
--- a/www/application/views/pages/login.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php  echo "This is the login page for existing users.";?>
diff --git a/www/application/views/pages/register.php b/www/application/views/pages/register.php
deleted file mode 100644
index 62676f0..0000000
--- a/www/application/views/pages/register.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-  $this->load->library('form_validation');
-  echo validation_errors();
-  echo form_open('form'); ?>
-
-  <h5>Name</h5>
-  <input type="text" name="name" value="" size="50" />
-
-  <h5>Email Address</h5>
-  <input type="text" name="email" value="" size="50" />
-
-  <h5>Username</h5>
-  <input type="text" name="username" value="" size="50" />
-
-  <h5>Password</h5>
-  <input type="text" name="password" value="" size="50" />
-
-  <h5>Password Confirm</h5>
-  <input type="text" name="passconf" value="" size="50" />
-
-  <div><input type="submit" value="Submit" /></div>
-
-  </form>
diff --git a/www/application/views/pages/profile.php b/www/application/views/profile.php
similarity index 100%
rename from www/application/views/pages/profile.php
rename to www/application/views/profile.php
diff --git a/www/application/views/register.php b/www/application/views/register.php
new file mode 100644
index 0000000..82111bb
--- /dev/null
+++ b/www/application/views/register.php
@@ -0,0 +1,25 @@
+<?php
+  $this->load->library('form_validation');
+  echo validation_errors();
+  echo form_open('register'); ?>
+
+  <h5>Name</h5>
+  <input type="text" name="name" value="<?php echo set_value('name'); ?>" size="50" />
+  <?php echo form_error('name'); ?>
+
+  <h5>Email Address</h5>
+  <input type="text" name="email" value="<?php echo set_value('email'); ?>" size="50" />
+  <?php echo form_error('email'); ?>
+
+  <h5>Username</h5>
+  <input type="text" name="username" value="<?php echo set_value('username'); ?>" size="50" />
+  <?php echo form_error('username'); ?>
+
+  <h5>Password</h5>
+  <input type="password" name="password" value="<?php echo set_value('password'); ?>" size="50" />
+  <?php echo form_error('password'); ?>
+
+  <br><br>
+  <div><input type="submit" value="Submit"/></div>
+
+  </form>