diff --git a/README.md b/README.md
index 9bdae977..3456128a 100755
--- a/README.md
+++ b/README.md
@@ -69,6 +69,10 @@ Special Permissions In Admin:
     auth | user | timer_management ( Access to create and remove timers)
     auth | user | timer_view ( Access to timerboard to view timers)
     auth | user | srp_management ( Allows for an individual to create and remove srp fleets and fleet data)
+    auth | user | sigtracker_management ( Allows for an individual to create and remove signitures)
+    auth | user | sigtracker_view ( Allows for an individual view signitures)
+    auth | user | optimer_management ( Allows for an individual to create and remove fleet operations)
+    auth | user | optimer_view ( Allows for an individual view fleet operations)
 
 Active Developers
 
diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py
index c0468ab4..a5f51def 100755
--- a/alliance_auth/urls.py
+++ b/alliance_auth/urls.py
@@ -170,6 +170,10 @@ urlpatterns = patterns('',
 			url(r'^sigtracker/$', 'sigtracker.views.sigtracker_view', name='auth_signature_view'),
 			url(r'^add_signature/$', 'sigtracker.views.add_signature_view', name='auth_add_signature_view'),
                 	url(r'^remove_signature/(\w+)', 'sigtracker.views.remove_signature', name='auth_remove_signature'),
-			
 
+                       # Fleet Operations Timers
+                       url(r'^optimer/$', 'optimer.views.optimer_view', name='auth_optimer_view'),
+                       url(r'^add_optimer/$', 'optimer.views.add_optimer_view', name='auth_add_optimer_view'),
+                       url(r'^remove_optimer/(\w+)', 'optimer.views.remove_optimer', name='auth_remove_optimer'),
+			
 )
diff --git a/optimer/__init__.py b/optimer/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/optimer/admin.py b/optimer/admin.py
new file mode 100644
index 00000000..85271e70
--- /dev/null
+++ b/optimer/admin.py
@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from models import optimer
+
+admin.site.register(optimer)
+# Register your models here.
diff --git a/optimer/form.py b/optimer/form.py
new file mode 100644
index 00000000..06b895c1
--- /dev/null
+++ b/optimer/form.py
@@ -0,0 +1,20 @@
+from django import forms
+from django.core.validators import MaxValueValidator, MinValueValidator
+
+
+
+class opForm(forms.Form):
+    
+    doctrine = forms.CharField(max_length=254, required=True, label='Doctrine')
+    system = forms.CharField(max_length=254, required=True, label="System")
+    location = forms.CharField(max_length=254, required=True, label="Location")
+    start_time = forms.CharField(max_length=254, required=True, label="Start Time")    
+    end_time = forms.CharField(max_length=254, required=True, label="End Time")
+    operation_name = forms.CharField(max_length=254, required=True, label="Operation Name")
+    fc = forms.CharField(max_length=254, required=True, label="Fleet Commander")
+    details = forms.CharField(max_length=254, required=False, label="Extra Details")
+    
+    
+    
+    
+    
diff --git a/optimer/models.py b/optimer/models.py
new file mode 100644
index 00000000..79d91d90
--- /dev/null
+++ b/optimer/models.py
@@ -0,0 +1,21 @@
+from django.db import models
+from django.contrib.auth.models import User
+from django.utils import timezone
+from eveonline.models import EveCharacter
+from eveonline.models import EveCorporationInfo
+
+
+class optimer(models.Model):
+    class Meta:
+        ordering = ['start_time']
+    doctrine = models.CharField(max_length=254, default="")
+    system = models.CharField(max_length=254, default="")
+    location = models.CharField(max_length=254, default="")
+    start_time = models.CharField(max_length=254, default="")
+    end_time = models.CharField(max_length=254, default="")
+    operation_name = models.CharField(max_length=254, default="")
+    fc = models.CharField(max_length=254, default="")
+    details = models.CharField(max_length=254, default="")
+    post_time = models.DateTimeField(default=timezone.now)
+    eve_character = models.ForeignKey(EveCharacter)
+    
diff --git a/optimer/tests.py b/optimer/tests.py
new file mode 100644
index 00000000..a39b155a
--- /dev/null
+++ b/optimer/tests.py
@@ -0,0 +1 @@
+# Create your tests here.
diff --git a/optimer/views.py b/optimer/views.py
new file mode 100644
index 00000000..6c06974e
--- /dev/null
+++ b/optimer/views.py
@@ -0,0 +1,83 @@
+
+
+from django.http import HttpResponseRedirect
+from django.template import RequestContext
+from django.shortcuts import render_to_response
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import permission_required
+from django.contrib.auth.decorators import user_passes_test
+from django.utils import timezone
+
+from util import check_if_user_has_permission
+from authentication.managers import AuthServicesInfoManager
+from eveonline.managers import EveManager
+from form import opForm
+from models import optimer
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+def optimer_util_test(user):
+    return check_if_user_has_permission(user, 'member') or check_if_user_has_permission(user, 'blue_member')
+
+
+@login_required
+@user_passes_test(optimer_util_test)
+@permission_required('auth.optimer_view')
+def optimer_view(request):
+    logger.debug("optimer_view called by user %s" % request.user)
+    optimer_list = optimer.objects.all()
+    render_items = {'optimer': optimer.objects.all(),}
+
+    return render_to_response('registered/operationmanagement.html', render_items, context_instance=RequestContext(request))
+
+
+@login_required
+@permission_required('auth.optimer_management')
+def add_optimer_view(request):
+    logger.debug("add_optimer_view called by user %s" % request.user)
+    if request.method == 'POST':
+    	form = opForm(request.POST)
+    	logger.debug("Request type POST contains form valid: %s" % form.is_valid())
+        if form.is_valid():
+            #Get Current Time
+            post_time = timezone.now()
+            # Get character
+            auth_info = AuthServicesInfoManager.get_auth_service_info(request.user)
+            character = EveManager.get_character_by_id(auth_info.main_char_id)
+            # handle valid form
+            op = optimer()
+            op.doctrine = form.cleaned_data['doctrine']
+            op.system = form.cleaned_data['system']
+            op.location = form.cleaned_data['location']
+            op.start_time = form.cleaned_data['start_time']
+            op.end_time = form.cleaned_data['end_time']
+            op.operation_name = form.cleaned_data['operation_name']
+            op.fc = form.cleaned_data['fc']
+            op.details = form.cleaned_data['details']
+            op.create_time = post_time
+            op.eve_character = character
+            op.save()
+            logger.info("User %s created op timer with name %s" % (request.user, op.operation_name))
+            return HttpResponseRedirect("/optimer/")
+    else:
+        logger.debug("Returning new opForm")
+        form = opForm()
+
+    render_items = {'form': form}
+
+    return render_to_response('registered/addoperation.html', render_items, context_instance=RequestContext(request))
+
+
+@login_required
+@permission_required('auth.optimer_management')
+def remove_optimer(request, optimer_id):
+    logger.debug("remove_optimer called by user %s for operation id %s" % (request.user, optimer_id))
+    if optimer.objects.filter(id=optimer_id).exists():
+        op = optimer.objects.get(id=optimer_id)
+        op.delete()
+        logger.info("Deleting optimer id %s by user %s" % (optimer_id, request.user))
+    else:
+        logger.error("Unable to delete optimer id %s for user %s - operation matching id not found." % (optimer_id, request.user))
+    return HttpResponseRedirect("/optimer/")
diff --git a/stock/templates/public/base.html b/stock/templates/public/base.html
index e92d1b8a..fc820a98 100755
--- a/stock/templates/public/base.html
+++ b/stock/templates/public/base.html
@@ -140,18 +140,24 @@
 			{% endif %}
 
                         {% if  perms.auth.member or perms.auth.blue_member %}
-							<li>
+			      <li>
                                 <a {% ifequal request.path "/sigtracker" %} class="active" {% endifequal %}
                                                                                   href="{% url 'auth_signature_view' %}"><i
                                         class="fa fa-compass fa-fw grayiconecolor"></i> Signature Tracker</a>
                             </li>
-
+			     
+                            <li>
+                                <a {% ifequal request.path "/optimer" %} class="active" {% endifequal %}
+                                                                                  href="{% url 'auth_optimer_view' %}"><i
+                                        class="fa fa-exclamation  fa-fw grayiconecolor"></i> Fleet Operations</a>
+                            </li>
+			
 
                             {% if perms.auth.timer_view %}
                                 <li>
                                     <a {% ifequal request.path "/timer_management" %} class="active" {% endifequal %}
                                                                                       href="{% url 'auth_timer_view' %}"><i
-                                            class="fa fa-clock-o fa-fw grayiconecolor"></i> OP Timers</a>
+                                            class="fa fa-clock-o fa-fw grayiconecolor"></i> Structure Timers</a>
                                 </li>
                             {% endif %}
 
diff --git a/stock/templates/registered/addoperation.html b/stock/templates/registered/addoperation.html
new file mode 100644
index 00000000..bf0aa8d5
--- /dev/null
+++ b/stock/templates/registered/addoperation.html
@@ -0,0 +1,38 @@
+{% extends "public/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+
+{% block title %}Alliance Auth - Fleet Operation Create{% endblock %}
+
+{% block page_title %}Create Operation{% endblock page_title %}
+{% block extra_css %}
+    <link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">Create Fleet Operation</h1>
+
+        <div class="container-fluid">
+            <div class="col-md-4 col-md-offset-4">
+                <div class="row">
+                        <form class="form-signin" role="form" action="" method="POST">
+                            {% csrf_token %}
+                            {{ form|bootstrap }}
+                            <br/>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">Create Fleet Operation</button>
+                        </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock content %}
+
+{% block extra_script %}
+
+    $('#id_eve_time').datetimepicker({
+    maskInput: true,
+    format: 'Y-m-d H:i',minDate:0
+    });
+
+{% endblock extra_script %}
diff --git a/stock/templates/registered/addtimer.html b/stock/templates/registered/addtimer.html
index eadd6c01..53939938 100755
--- a/stock/templates/registered/addtimer.html
+++ b/stock/templates/registered/addtimer.html
@@ -1,38 +1,38 @@
-{% extends "public/base.html" %}
-{% load bootstrap %}
-{% load staticfiles %}
-
-{% block title %}Alliance Auth - Timer Create{% endblock %}
-
-{% block page_title %}Timer Create{% endblock page_title %}
-{% block extra_css %}
-    <link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
-
-{% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">Create Timer</h1>
-
-        <div class="container-fluid">
-            <div class="col-md-4 col-md-offset-4">
-                <div class="row">
-                        <form class="form-signin" role="form" action="" method="POST">
-                            {% csrf_token %}
-                            {{ form|bootstrap }}
-                            <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">Create Timer</button>
-                        </form>
-                </div>
-            </div>
-        </div>
-    </div>
-
-{% endblock content %}
-
-{% block extra_script %}
-
-    $('#id_eve_time').datetimepicker({
-    maskInput: true,
-    format: 'Y-m-d H:i',minDate:0
-    });
-
-{% endblock extra_script %}
+{% extends "public/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+
+{% block title %}Alliance Auth - Structure Timer Create{% endblock %}
+
+{% block page_title %}Timer Create{% endblock page_title %}
+{% block extra_css %}
+    <link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">Create Structure Timer</h1>
+
+        <div class="container-fluid">
+            <div class="col-md-4 col-md-offset-4">
+                <div class="row">
+                        <form class="form-signin" role="form" action="" method="POST">
+                            {% csrf_token %}
+                            {{ form|bootstrap }}
+                            <br/>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">Create Timer</button>
+                        </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock content %}
+
+{% block extra_script %}
+
+    $('#id_eve_time').datetimepicker({
+    maskInput: true,
+    format: 'Y-m-d H:i',minDate:0
+    });
+
+{% endblock extra_script %}
diff --git a/stock/templates/registered/operationmanagement.html b/stock/templates/registered/operationmanagement.html
new file mode 100644
index 00000000..d05d95dd
--- /dev/null
+++ b/stock/templates/registered/operationmanagement.html
@@ -0,0 +1,71 @@
+{% extends "public/base.html" %}
+{% load staticfiles %}
+
+{% block title %}Alliance Auth{% endblock %}
+
+{% block page_title %}Fleet Operation Management{% endblock page_title %}
+{% block extra_css %}{% endblock extra_css %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">Fleet Operation Timers
+            <div class="text-right">
+                <a href="{% url 'auth_add_optimer_view' %}">
+                    {% if perms.auth.optimer_management %}
+                        <button type="button" class="btn btn-success">Create Operation</button>
+                    {% endif %}
+                </a>
+            </div>
+        </h1>
+        <table class="table table-responsive table-bordered">
+            <tr>
+                <th class="text-center">Operation Name</th>
+                <th class="text-center">Form Up System</th>
+                <th class="text-center">Form Up Location</th>
+                <th class="text-center">Start Time</th>
+		<th class="text-center">End Time</th>
+                <th class="text-center">FC</th>
+		<th class="text-center">Details</th>
+		<th class="text-center">Post Time</th>
+		{% if perms.auth.optimer_management %}
+           <th class="text-center">Creator</th> 
+		   <th class="text-center">Action</th>
+                {% endif %}
+            </tr>
+            	              
+                {% for ops in optimer %}
+                <tr>
+       		<td style="width:150px" class="text-center">{{ ops.operation_name }}</td>
+                
+                <td class="text-center">
+                <a href="http://evemaps.dotlan.net/system/{{ ops.system }}">{{ ops.system }}</a>
+                </td>
+                <td style="width:150px" class="text-center">{{ ops.location }}</td>
+                <td style="width:150px" class="text-center">{{ ops.start_time }}</td>
+				<td style="width:150px" class="text-center">{{ ops.end_time }}</td>
+ 	  			<td style="width:150px" class="text-center">{{ ops.fc }}</td>
+                <td style="width:150px" class="text-center">{{ ops.details }}</td>
+                <td style="width:150px" class="text-center">{{ ops.post_time}}</td>   			 
+                {% if perms.auth.optimer_management %}
+                <td style="width:150px" class="text-center">{{ ops.eve_character }}</td>
+                    <td class="text-center">
+                        <a href="/remove_optimer/{{ ops.id }}">
+                            <button type="button" class="btn btn-danger"><span
+                                    class="glyphicon glyphicon-remove"></span></button>
+                        </a>
+                    </td>
+              
+              
+              {% endif %}
+              </tr>
+              {% endfor %}
+            </tr>
+        </table>
+
+        
+    </div>
+
+
+
+
+{% endblock content %}
diff --git a/stock/templates/registered/signaturemanagement.html b/stock/templates/registered/signaturemanagement.html
index ff7820ad..d9010bcc 100644
--- a/stock/templates/registered/signaturemanagement.html
+++ b/stock/templates/registered/signaturemanagement.html
@@ -43,18 +43,19 @@
                 <td style="width:150px" class="text-center">{{ sigt.sigtype }}</td>
 		<td style="width:150px" class="text-center">{{ sigt.status }}</td>
 		<td style="width:150px" class="text-center">{{ sigt.notes }}</td>
-                <td style="width:150px" class="text-center">{{ sigt.post_time}}</td>   			 
+                <td style="width:150px" class="text-center">{{ sigt.post_time}}</td>
                 {% if perms.auth.signature_management %}
                 <td style="width:150px" class="text-center">{{ sigt.eve_character }}</td>
-                    <td class="text-center">
-                        <a href="/remove_signature/{{ sigt.id }}">
+                <td class="text-center">
+                	<a href="/remove_signature/{{ sigt.id }}">
                             <button type="button" class="btn btn-danger"><span
                                     class="glyphicon glyphicon-remove"></span></button>
                         </a>
-                    </td>
-              </tr>
+                    	</td>
+                
               
-              {% endif %}
+		{% endif %}
+		</tr>
               {% endfor %}
             </tr>
         </table>
diff --git a/stock/templates/registered/timermanagement.html b/stock/templates/registered/timermanagement.html
index 3af49280..1064ccd8 100755
--- a/stock/templates/registered/timermanagement.html
+++ b/stock/templates/registered/timermanagement.html
@@ -1,342 +1,342 @@
-{% extends "public/base.html" %}
-{% load staticfiles %}
-
-{% block title %}Alliance Auth{% endblock %}
-
-{% block page_title %}Timer Management{% endblock page_title %}
-{% block extra_css %}{% endblock extra_css %}
-
-{% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">Operation Timers
-            <div class="text-right">
-                <a href="{% url 'auth_add_timer_view' %}">
-                    {% if perms.auth.timer_management %}
-                        <button type="button" class="btn btn-success">Create Timer</button>
-                    {% endif %}
-                </a>
-            </div>
-        </h1>
-        <div class="col-lg-12 text-center">
-            <div class="label label-info text-left">
-                <b>Current Eve Time: </b>
-            </div><div class="label label-info text-left" id="current-time"></div>
-        </div>
-        <h4><b>Next Timer</b></h4>
-        <table class="table table-responsive table-bordered">
-            <tr>
-                <th style="width:150px" class="text-center">Details</th>
-                <th class="text-center">Objective</th>
-                <th class="text-center">System</th>
-                <th class="text-center">Structure</th>
-                <th class="text-center">Eve Time</th>
-		<th class="text-center">Local Time</th>
-                <th class="text-center">Creator</th>
-                {% if perms.auth.timer_management %}
-                    <th class="text-center">Action</th>
-                {% endif %}
-            </tr>
-            {% if closest_timer %}
-                {% ifequal closest_timer.important True %}
-                    <tr class="danger">
-                        {% else %}
-                    <tr class="info">
-                {% endifequal %}
-                <td style="width:150px" class="text-center">{{ closest_timer.details }}</td>
-                <td class="text-center">
-                    {% ifequal closest_timer.objective "Hostile" %}
-                        <div class="label label-danger">
-                            Hostile
-                        </div>
-                    {% endifequal %}
-                    {% ifequal closest_timer.objective "Friendly" %}
-                        <div class="label label-primary">
-                            Friendly
-                        </div>
-                    {% endifequal %}
-                    {% ifequal closest_timer.objective "Neutral" %}
-                        <div class="label label-default">
-                            Neutral
-                        </div>
-                    {% endifequal %}
-                </td>
-                <td class="text-center"><a
-                        href="http://evemaps.dotlan.net/system/{{ closest_timer.system }}">{{ closest_timer.system }} {{ closest_timer.planet_moon }} </a>
-                </td>
-                <td class="text-center">
-                    {% ifequal closest_timer.structure "I-HUB" %}
-                        <div class="label label-warning">
-                            I-HUB
-                        </div>
-                    {% endifequal %}
-                    {% ifequal closest_timer.structure "POCO" %}
-                        <div class="label label-success">
-                            POCO
-                        </div>
-                    {% endifequal %}
-                    {% ifequal closest_timer.structure "POS[S]" %}
-                        <div class="label label-info">
-                            POS [S]
-                        </div>
-                    {% endifequal %}
-                    {% ifequal closest_timer.structure "POS[M]" %}
-                        <div class="label label-info">
-                            POS [M]
-                        </div>
-                    {% endifequal %}
-                    {% ifequal closest_timer.structure "POS[L]" %}
-                        <div class="label label-info">
-                            POS [L]
-                        </div>
-                    {% endifequal %}
-                    {% ifequal closest_timer.structure "Station" %}
-                        <div class="label label-danger">
-                            Station
-                        </div>
-                    {% endifequal %}
-                    {% ifequal closest_timer.structure "TCU" %}
-                        <div class="label label-danger">
-                            TCU
-                        </div>
-                    {% endifequal %}
-                    {% ifequal closest_timer.structure "Other" %}
-                        <div class="label label-default">
-                            Other
-                        </div>
-                    {% endifequal %}
-                </td>
-                <td class="text-center" nowrap>{{ closest_timer.eve_time | date:"Y-m-d H:i" }}</td>
-		<td id="countdownclosest" class="text-center" nowrap></td>
-		<td class="text-center">{{ closest_timer.eve_character.character_name }}</td>
-                {% if perms.auth.timer_management %}
-                    <td class="text-center">
-
-                        <a href="/remove_timer/{{ closest_timer.id }}">
-                            <button type="button" class="btn btn-danger"><span
-                                    class="glyphicon glyphicon-remove"></span></button>
-                        </a>
-                    </td>
-                {% endif %}
-            {% endif %}
-            </tr>
-        </table>
-        {% if corp_timers %}
-            <h4><b>Corp Timers</b></h4>
-            <table class="table table-bordered">
-                <tr>
-                    <th style="width:150px" class="text-center">Details</th>
-                    <th class="text-center">Objective</th>
-                    <th class="text-center">System</th>
-                    <th class="text-center">Structure</th>
-                    <th class="text-center">Eve Time</th>
-                    <th class="text-center">Local Time</th>
-                    <th class="text-center">Creator</th>
-                    {% if perms.auth.timer_management %}
-                        <th class="text-center">Action</th>
-                    {% endif %}
-                </tr>
-                {% for timer in corp_timers %}
-                    {% ifequal timer.important True %}
-                        <tr class="danger">
-                            {% else %}
-                        <tr class="info">
-                    {% endifequal %}
-                <td style="width:150px" class="text-center">{{ timer.details }}</td>
-                <td class="text-center">
-                    {% ifequal timer.objective "Hostile" %}
-                        <div class="label label-danger">
-                            Hostile
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.objective "Friendly" %}
-                        <div class="label label-primary">
-                            Friendly
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.objective "Neutral" %}
-                        <div class="label label-default">
-                            Neutral
-                        </div>
-                    {% endifequal %}
-                </td>
-                <td class="text-center"><a
-                        href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a>
-                </td>
-                <td class="text-center">
-                    {% ifequal timer.structure "I-HUB" %}
-                        <div class="label label-warning">
-                            I-HUB
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POCO" %}
-                        <div class="label label-success">
-                            POCO
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[S]" %}
-                        <div class="label label-info">
-                            POS [S]
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[M]" %}
-                        <div class="label label-info">
-                            POS [M]
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[L]" %}
-                        <div class="label label-info">
-                            POS [L]
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Station" %}
-                        <div class="label label-danger">
-                            Station
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "TCU" %}
-                        <div class="label label-danger">
-                            TCU
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Other" %}
-                        <div class="label label-default">
-                            Other
-                        </div>
-                    {% endifequal %}
-                </td>
-                <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
-                <td class="text-center" nowrap><div id="countdown{{ timer.id }}"></div></td>
-                <td class="text-center">{{ timer.eve_character.character_name }}</td>
-                {% if perms.auth.timer_management %}
-                    <td class="text-center">
-                        <a href="/remove_timer/{{ timer.id }}">
-                            <button type="button" class="btn btn-danger"><span
-                                    class="glyphicon glyphicon-remove"></span></button>
-                        </a>
-                    </td>
-                {% endif %}
-                </tr>
-            {% endfor %}
-            </table>
-        {% endif %}
-        <h4><b>Future Timers</b></h4>
-        <table class="table table-bordered">
-            <tr>
-                <th style="width:150px" class="text-center">Details</th>
-                <th class="text-center">Objective</th>
-                <th class="text-center">System</th>
-                <th class="text-center">Structure</th>
-                <th class="text-center">Eve Time</th>
-                <th class="text-center">Local Time</th>
-                <th class="text-center">Creator</th>
-                {% if perms.auth.timer_management %}
-                    <th class="text-center">Action</th>
-                {% endif %}
-            </tr>
-            {% for timer in timers %}
-                {% ifnotequal timer closest_timer %}
-                    {% ifequal timer.important True %}
-                        <tr class="danger">
-                            {% else %}
-                        <tr class="info">
-                    {% endifequal %}
-                <td style="width:150px" class="text-center">{{ timer.details }}</td>
-                <td class="text-center">
-                    {% ifequal timer.objective "Hostile" %}
-                        <div class="label label-danger">
-                            Hostile
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.objective "Friendly" %}
-                        <div class="label label-primary">
-                            Friendly
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.objective "Neutral" %}
-                        <div class="label label-default">
-                            Neutral
-                        </div>
-                    {% endifequal %}
-                </td>
-                <td class="text-center"><a
-                        href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a>
-                </td>
-                <td class="text-center">
-                    {% ifequal timer.structure "I-HUB" %}
-                        <div class="label label-warning">
-                            I-HUB
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POCO" %}
-                        <div class="label label-success">
-                            POCO
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[S]" %}
-                        <div class="label label-info">
-                            POS [S]
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[M]" %}
-                        <div class="label label-info">
-                            POS [M]
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[L]" %}
-                        <div class="label label-info">
-                            POS [L]
-                        </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Station" %}
-                        <div class="label label-danger">
-                            Station
-                        </div>
-                   {% endifequal %}
-                   {% ifequal timer.structure "TCU" %}
-                        <div class="label label-danger">
-                            TCU
-                        </div>
-                   {% endifequal %}
-                    {% ifequal timer.structure "Other" %}
-                        <div class="label label-default">
-                            Other
-                        </div>
-                    {% endifequal %}
-                </td>
-                <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
-                <td class="text-center" nowrap><div id="countdown{{ timer.id }}"></div></td>
-                <td class="text-center">{{ timer.eve_character.character_name }}</td>
-                {% if perms.auth.timer_management %}
-                    <td class="text-center">
-                        <a href="/remove_timer/{{ timer.id }}">
-                            <button type="button" class="btn btn-danger"><span
-                                    class="glyphicon glyphicon-remove"></span></button>
-                        </a>
-                    </td>
-                {% endif %}
-                </tr>
-                {% endifnotequal %}
-            {% endfor %}
-        </table>
-    </div>
-
-
-<script src="/static/js/dateformat.js"></script>
-<script src="/static/js/countdown.js"></script>
-<script>
-var clockClosest = document.getElementById("countdownclosest"), targetDate = new Date(Date.UTC({{ closest_timer.eve_time | date:"Y, m-1, d, H, i" }}));{% for timer in timers %}
-var clock{{ timer.id }} = document.getElementById("countdown{{ timer.id }}"), targetDate{{ timer.id }} = new Date(Date.UTC({{ timer.eve_time | date:"Y, m-1, d, H, i" }}));{% endfor %}
-
-setInterval(function(){clockClosest.innerHTML = targetDate.format('D @ h:ia'); if (targetDate > Date.now()){ clockClosest.innerHTML = clockClosest.innerHTML + "<BR>" + countdown(targetDate).toString();}}, 1000);
-{% for timer in timers %}setInterval(function(){clock{{ timer.id }}.innerHTML = targetDate{{ timer.id }}.format('D @ h:ia'); if (targetDate{{ timer.id }} > Date.now()){ clock{{ timer.id }}.innerHTML = clock{{ timer.id }}.innerHTML + "<BR>" + countdown(targetDate{{ timer.id }}).toString();}}, 1000);{% endfor %}
-{% for timer in corp_timers %}setInterval(function(){clock{{ timer.id }}.innerHTML = targetDate{{ timer.id }}.format('D @ h:ia'); if (targetDate{{ timer.id }} > Date.now()){ clock{{ timer.id }}.innerHTML = clock{{ timer.id }}.innerHTML + "<BR>" + countdown(targetDate{{ timer.id }}).toString();}}, 1000);{% endfor %}
-
-setInterval(function(){updateClock()}, 1000);
-
-function updateClock() {
-  var clock = new Date();
-  document.getElementById("current-time").innerHTML = "<b>" + clock.toUTCString() + "</b>";
-}
-
-</script>
-{% endblock content %}
+{% extends "public/base.html" %}
+{% load staticfiles %}
+
+{% block title %}Alliance Auth{% endblock %}
+
+{% block page_title %}Structure Timer Management{% endblock page_title %}
+{% block extra_css %}{% endblock extra_css %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">Structure Timers
+            <div class="text-right">
+                <a href="{% url 'auth_add_timer_view' %}">
+                    {% if perms.auth.timer_management %}
+                        <button type="button" class="btn btn-success">Create Structure Timer</button>
+                    {% endif %}
+                </a>
+            </div>
+        </h1>
+        <div class="col-lg-12 text-center">
+            <div class="label label-info text-left">
+                <b>Current Eve Time: </b>
+            </div><div class="label label-info text-left" id="current-time"></div>
+        </div>
+        <h4><b>Next Timer</b></h4>
+        <table class="table table-responsive table-bordered">
+            <tr>
+                <th style="width:150px" class="text-center">Details</th>
+                <th class="text-center">Objective</th>
+                <th class="text-center">System</th>
+                <th class="text-center">Structure</th>
+                <th class="text-center">Eve Time</th>
+		<th class="text-center">Local Time</th>
+                <th class="text-center">Creator</th>
+                {% if perms.auth.timer_management %}
+                    <th class="text-center">Action</th>
+                {% endif %}
+            </tr>
+            {% if closest_timer %}
+                {% ifequal closest_timer.important True %}
+                    <tr class="danger">
+                        {% else %}
+                    <tr class="info">
+                {% endifequal %}
+                <td style="width:150px" class="text-center">{{ closest_timer.details }}</td>
+                <td class="text-center">
+                    {% ifequal closest_timer.objective "Hostile" %}
+                        <div class="label label-danger">
+                            Hostile
+                        </div>
+                    {% endifequal %}
+                    {% ifequal closest_timer.objective "Friendly" %}
+                        <div class="label label-primary">
+                            Friendly
+                        </div>
+                    {% endifequal %}
+                    {% ifequal closest_timer.objective "Neutral" %}
+                        <div class="label label-default">
+                            Neutral
+                        </div>
+                    {% endifequal %}
+                </td>
+                <td class="text-center"><a
+                        href="http://evemaps.dotlan.net/system/{{ closest_timer.system }}">{{ closest_timer.system }} {{ closest_timer.planet_moon }} </a>
+                </td>
+                <td class="text-center">
+                    {% ifequal closest_timer.structure "I-HUB" %}
+                        <div class="label label-warning">
+                            I-HUB
+                        </div>
+                    {% endifequal %}
+                    {% ifequal closest_timer.structure "POCO" %}
+                        <div class="label label-success">
+                            POCO
+                        </div>
+                    {% endifequal %}
+                    {% ifequal closest_timer.structure "POS[S]" %}
+                        <div class="label label-info">
+                            POS [S]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal closest_timer.structure "POS[M]" %}
+                        <div class="label label-info">
+                            POS [M]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal closest_timer.structure "POS[L]" %}
+                        <div class="label label-info">
+                            POS [L]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal closest_timer.structure "Station" %}
+                        <div class="label label-danger">
+                            Station
+                        </div>
+                    {% endifequal %}
+                    {% ifequal closest_timer.structure "TCU" %}
+                        <div class="label label-danger">
+                            TCU
+                        </div>
+                    {% endifequal %}
+                    {% ifequal closest_timer.structure "Other" %}
+                        <div class="label label-default">
+                            Other
+                        </div>
+                    {% endifequal %}
+                </td>
+                <td class="text-center" nowrap>{{ closest_timer.eve_time | date:"Y-m-d H:i" }}</td>
+		<td id="countdownclosest" class="text-center" nowrap></td>
+		<td class="text-center">{{ closest_timer.eve_character.character_name }}</td>
+                {% if perms.auth.timer_management %}
+                    <td class="text-center">
+
+                        <a href="/remove_timer/{{ closest_timer.id }}">
+                            <button type="button" class="btn btn-danger"><span
+                                    class="glyphicon glyphicon-remove"></span></button>
+                        </a>
+                    </td>
+                {% endif %}
+            {% endif %}
+            </tr>
+        </table>
+        {% if corp_timers %}
+            <h4><b>Corp Timers</b></h4>
+            <table class="table table-bordered">
+                <tr>
+                    <th style="width:150px" class="text-center">Details</th>
+                    <th class="text-center">Objective</th>
+                    <th class="text-center">System</th>
+                    <th class="text-center">Structure</th>
+                    <th class="text-center">Eve Time</th>
+                    <th class="text-center">Local Time</th>
+                    <th class="text-center">Creator</th>
+                    {% if perms.auth.timer_management %}
+                        <th class="text-center">Action</th>
+                    {% endif %}
+                </tr>
+                {% for timer in corp_timers %}
+                    {% ifequal timer.important True %}
+                        <tr class="danger">
+                            {% else %}
+                        <tr class="info">
+                    {% endifequal %}
+                <td style="width:150px" class="text-center">{{ timer.details }}</td>
+                <td class="text-center">
+                    {% ifequal timer.objective "Hostile" %}
+                        <div class="label label-danger">
+                            Hostile
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.objective "Friendly" %}
+                        <div class="label label-primary">
+                            Friendly
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.objective "Neutral" %}
+                        <div class="label label-default">
+                            Neutral
+                        </div>
+                    {% endifequal %}
+                </td>
+                <td class="text-center"><a
+                        href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a>
+                </td>
+                <td class="text-center">
+                    {% ifequal timer.structure "I-HUB" %}
+                        <div class="label label-warning">
+                            I-HUB
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "POCO" %}
+                        <div class="label label-success">
+                            POCO
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "POS[S]" %}
+                        <div class="label label-info">
+                            POS [S]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "POS[M]" %}
+                        <div class="label label-info">
+                            POS [M]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "POS[L]" %}
+                        <div class="label label-info">
+                            POS [L]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "Station" %}
+                        <div class="label label-danger">
+                            Station
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "TCU" %}
+                        <div class="label label-danger">
+                            TCU
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "Other" %}
+                        <div class="label label-default">
+                            Other
+                        </div>
+                    {% endifequal %}
+                </td>
+                <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
+                <td class="text-center" nowrap><div id="countdown{{ timer.id }}"></div></td>
+                <td class="text-center">{{ timer.eve_character.character_name }}</td>
+                {% if perms.auth.timer_management %}
+                    <td class="text-center">
+                        <a href="/remove_timer/{{ timer.id }}">
+                            <button type="button" class="btn btn-danger"><span
+                                    class="glyphicon glyphicon-remove"></span></button>
+                        </a>
+                    </td>
+                {% endif %}
+                </tr>
+            {% endfor %}
+            </table>
+        {% endif %}
+        <h4><b>Future Timers</b></h4>
+        <table class="table table-bordered">
+            <tr>
+                <th style="width:150px" class="text-center">Details</th>
+                <th class="text-center">Objective</th>
+                <th class="text-center">System</th>
+                <th class="text-center">Structure</th>
+                <th class="text-center">Eve Time</th>
+                <th class="text-center">Local Time</th>
+                <th class="text-center">Creator</th>
+                {% if perms.auth.timer_management %}
+                    <th class="text-center">Action</th>
+                {% endif %}
+            </tr>
+            {% for timer in timers %}
+                {% ifnotequal timer closest_timer %}
+                    {% ifequal timer.important True %}
+                        <tr class="danger">
+                            {% else %}
+                        <tr class="info">
+                    {% endifequal %}
+                <td style="width:150px" class="text-center">{{ timer.details }}</td>
+                <td class="text-center">
+                    {% ifequal timer.objective "Hostile" %}
+                        <div class="label label-danger">
+                            Hostile
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.objective "Friendly" %}
+                        <div class="label label-primary">
+                            Friendly
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.objective "Neutral" %}
+                        <div class="label label-default">
+                            Neutral
+                        </div>
+                    {% endifequal %}
+                </td>
+                <td class="text-center"><a
+                        href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a>
+                </td>
+                <td class="text-center">
+                    {% ifequal timer.structure "I-HUB" %}
+                        <div class="label label-warning">
+                            I-HUB
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "POCO" %}
+                        <div class="label label-success">
+                            POCO
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "POS[S]" %}
+                        <div class="label label-info">
+                            POS [S]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "POS[M]" %}
+                        <div class="label label-info">
+                            POS [M]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "POS[L]" %}
+                        <div class="label label-info">
+                            POS [L]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "Station" %}
+                        <div class="label label-danger">
+                            Station
+                        </div>
+                   {% endifequal %}
+                   {% ifequal timer.structure "TCU" %}
+                        <div class="label label-danger">
+                            TCU
+                        </div>
+                   {% endifequal %}
+                    {% ifequal timer.structure "Other" %}
+                        <div class="label label-default">
+                            Other
+                        </div>
+                    {% endifequal %}
+                </td>
+                <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
+                <td class="text-center" nowrap><div id="countdown{{ timer.id }}"></div></td>
+                <td class="text-center">{{ timer.eve_character.character_name }}</td>
+                {% if perms.auth.timer_management %}
+                    <td class="text-center">
+                        <a href="/remove_timer/{{ timer.id }}">
+                            <button type="button" class="btn btn-danger"><span
+                                    class="glyphicon glyphicon-remove"></span></button>
+                        </a>
+                    </td>
+                {% endif %}
+                </tr>
+                {% endifnotequal %}
+            {% endfor %}
+        </table>
+    </div>
+
+
+<script src="/static/js/dateformat.js"></script>
+<script src="/static/js/countdown.js"></script>
+<script>
+var clockClosest = document.getElementById("countdownclosest"), targetDate = new Date(Date.UTC({{ closest_timer.eve_time | date:"Y, m-1, d, H, i" }}));{% for timer in timers %}
+var clock{{ timer.id }} = document.getElementById("countdown{{ timer.id }}"), targetDate{{ timer.id }} = new Date(Date.UTC({{ timer.eve_time | date:"Y, m-1, d, H, i" }}));{% endfor %}
+
+setInterval(function(){clockClosest.innerHTML = targetDate.format('D @ h:ia'); if (targetDate > Date.now()){ clockClosest.innerHTML = clockClosest.innerHTML + "<BR>" + countdown(targetDate).toString();}}, 1000);
+{% for timer in timers %}setInterval(function(){clock{{ timer.id }}.innerHTML = targetDate{{ timer.id }}.format('D @ h:ia'); if (targetDate{{ timer.id }} > Date.now()){ clock{{ timer.id }}.innerHTML = clock{{ timer.id }}.innerHTML + "<BR>" + countdown(targetDate{{ timer.id }}).toString();}}, 1000);{% endfor %}
+{% for timer in corp_timers %}setInterval(function(){clock{{ timer.id }}.innerHTML = targetDate{{ timer.id }}.format('D @ h:ia'); if (targetDate{{ timer.id }} > Date.now()){ clock{{ timer.id }}.innerHTML = clock{{ timer.id }}.innerHTML + "<BR>" + countdown(targetDate{{ timer.id }}).toString();}}, 1000);{% endfor %}
+
+setInterval(function(){updateClock()}, 1000);
+
+function updateClock() {
+  var clock = new Date();
+  document.getElementById("current-time").innerHTML = "<b>" + clock.toUTCString() + "</b>";
+}
+
+</script>
+{% endblock content %}
diff --git a/util/__init__.py b/util/__init__.py
index 84a09d70..6c269077 100755
--- a/util/__init__.py
+++ b/util/__init__.py
@@ -24,6 +24,8 @@ def bootstrap_permissions():
     Permission.objects.get_or_create(codename="srp_management", content_type=ct, name="srp_management")
     Permission.objects.get_or_create(codename="signature_management", content_type=ct, name="signature_management")
     Permission.objects.get_or_create(codename="signature_view", content_type=ct, name="signature_view")
+    Permission.objects.get_or_create(codename="optimer_management", content_type=ct, name="optimer_management")
+    Permission.objects.get_or_create(codename="optimer_view", content_type=ct, name="optimer_view")
     Group.objects.get_or_create(name=settings.DEFAULT_AUTH_GROUP)
     Group.objects.get_or_create(name=settings.DEFAULT_BLUE_GROUP)
     logger.info("Bootstrapped permissions for auth and created default groups.")