diff --git a/application/controllers/yllapito.php b/application/controllers/yllapito.php
index 5be014a..fe37f36 100644
--- a/application/controllers/yllapito.php
+++ b/application/controllers/yllapito.php
@@ -9,8 +9,11 @@ class Yllapito extends CI_Controller
     {
         parent::__construct();
         $this->load->model('ecard_model', 'ecard');
+        $this->load->model('user_model', 'users');
         $this->load->model('erkanaauth_model', 'erkana');
 
+        $this->load->helper('date');
+
         $this->user = $this->erkana->getUser();
 
         if (!empty($this->user)) {
@@ -120,6 +123,48 @@ class Yllapito extends CI_Controller
         $this->load->view('_footer', $data);
     }
 
+    public function users($section = 'listall', $user_id = null, $action = null)
+    {
+        if (empty($this->user)) {
+            redirect("/yllapito/kirjaudu");
+        }
+
+        $data = array(
+            'page_title'    => array( 'Ystäväkylä eKortti' ),
+            'page_classes'  => array( 'frontpage' ),
+            'user'          => $this->user,
+            'count'         => $this->card_count,
+            'messages'      => $this->session->flashdata('messages')
+        );
+        $page_title = array();
+
+        switch ($section) {
+            case 'modify':
+                if ($action == "delete" && is_numeric($user_id)) {
+                    $this->user->delete($user_id);
+                }
+                redirect("yllapito/users");
+                break;
+            case 'show':
+                $data['userid'] = $user_id;
+                $data['userdata'] = $this->users->get($user_id);
+                $page_title = array("Tiedot", "Käyttäjät");
+                break;
+            default:
+                $data['users'] = $this->users->get_all();
+                $page_title = array("Listaa kaikki", "Käyttäjät");
+                break;
+        }
+
+
+        $data['page_title'] = array_merge($page_title, $data['page_title']);
+        $page = 'yllapito/users_'.$section;
+
+        $this->load->view('_header', $data);
+        $this->load->view($page, $data);
+        $this->load->view('_footer', $data);
+    }
+
     public function kirjaudu()
     {
         // POST
diff --git a/application/models/user_model.php b/application/models/user_model.php
new file mode 100644
index 0000000..f1b76e5
--- /dev/null
+++ b/application/models/user_model.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * User model that we use to control our users
+ */
+class User_model extends MY_Model
+{
+    public $before_create = array( 'timestamps' );
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    protected function timestamps($ecard)
+    {
+        $ecard['created_at'] = $ecard['updated_at'] = date('Y-m-d H:i:s');
+        return $ecard;
+    }
+}
diff --git a/application/views/yllapito/users_listall.php b/application/views/yllapito/users_listall.php
new file mode 100644
index 0000000..fd849bd
--- /dev/null
+++ b/application/views/yllapito/users_listall.php
@@ -0,0 +1,84 @@
+
+
+<div class="row">
+    <div class="large-12 small-12 columns">
+        <div class="panel">
+
+            <h2>Kaikki käyttäjät</h2>
+
+<?php
+if (empty($user)) {
+    $user = new stdClass();
+}
+
+if ($user->can_seeusers == 'no') { ?>
+            <div data-alert class="alert-box error">
+                Sinulla ei ole oikeutta käyttäjien listaamiseen.
+            </div>
+    <?php
+} else { ?>
+
+            <table>
+                <thead>
+                    <tr>
+                        <th>Nimi</th>
+                        <th>Tunnus lisätty</th>
+                        <th>Edellinen kirjautuminen</th>
+                        <th>Julkaisu</th>
+                        <th>Näkee jäsenet</th>
+                        <th>Hallitsee jäseniä</th>
+                    </tr>
+                </thead>
+                <tbody>
+    <?php
+    if (empty($users)) {
+        $users = array();
+    } else {
+
+        $ok = site_url('assets/img/ok.png');
+        $no = site_url('assets/img/no.png');
+        $now = time();
+
+        foreach ($users as $usr) {
+
+            // Set images accordingly permissions
+            $queue  = ($usr->can_approve  == "yes") ? img($ok, true) : img($no, true);
+            $seeusr = ($usr->can_seeusers == "yes") ? img($ok, true) : img($no, true);
+            $modusr = ($usr->can_modusers == "yes") ? img($ok, true) : img($no, true);
+
+            $name   = $usr->firstname. " ". $usr->lastname;
+
+            ?>
+
+                    <tr>
+                        <td><?php echo lnk("yllapito/users/show/". $usr->id, $name); ?><br>
+                            <small><?php echo $usr->username; ?></small>
+                        </td>
+                        <td><?php
+                                echo $usr->created_at; ?><br><small><?php
+                                echo timespan(strtotime($usr->created_at), $now);
+                            ?></small></td>
+                        <td><?php
+                                echo $usr->last_login;
+                                ?><br><small><?php
+                                echo timespan(strtotime($usr->last_login), $now);
+                            ?></small></td>
+                        <td><?php echo $queue; ?></td>
+                        <td><?php echo $seeusr; ?></td>
+                        <td><?php echo $modusr; ?></td>
+                    </tr>
+
+        <?php
+        }
+    }
+    ?>
+
+                </tbody>
+            </table>
+    <?php
+}
+?>
+
+        </div>
+    </div>
+</div>
diff --git a/application/views/yllapito/users_show.php b/application/views/yllapito/users_show.php
new file mode 100644
index 0000000..9bfea2d
--- /dev/null
+++ b/application/views/yllapito/users_show.php
@@ -0,0 +1,37 @@
+
+<?php
+if (empty($userdata)) {
+    $userdata = array();
+}
+
+?>
+
+<div class="row">
+    <div class="large-12 small-12 columns">
+        <div class="panel">
+
+<?php
+if ($user->can_seeusers == "no") {
+    ?>
+            <div data-alert class="alert-box error">
+                Sinulla ei ole oikeutta käyttäjien listaamiseen.
+            </div>
+            <?php echo lnk("yllapito/users", "Takaisin"); ?>
+    <?php
+} elseif (empty($userdata) || ! is_object($userdata)) {
+    ?>
+            <h2>Käyttäjää tunnisteella #<?php echo $userid; ?> ei löydetty</h2>
+            <?php echo lnk("yllapito/users", "Takaisin"); ?>
+    <?php
+} else {
+    ?>
+            <h2>Käyttäjä #<?php echo $userdata->id; ?></h2>
+
+
+    <?php
+}
+?>
+
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/assets/img/no.png b/assets/img/no.png
new file mode 100755
index 0000000..dbe5749
Binary files /dev/null and b/assets/img/no.png differ
diff --git a/assets/img/ok.png b/assets/img/ok.png
new file mode 100755
index 0000000..35e767c
Binary files /dev/null and b/assets/img/ok.png differ