diff --git a/.gitignore b/.gitignore
index 06088bc7..b1beff8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .emergence
+.data
diff --git a/html-templates/projects/project.tpl b/html-templates/projects/project.tpl
index 5407acd1..9e41d2b1 100644
--- a/html-templates/projects/project.tpl
+++ b/html-templates/projects/project.tpl
@@ -4,7 +4,75 @@
 
 {block content}
     {$Project = $data}
-
+    
+    <form id="modify-role" class="modal fade form-horizontal" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/modify-role" method="POST">
+        <div class="modal-dialog">    
+            <div class="modal-content">    
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                    <h2 id="add-member-title" class="modal-title">{_ "Edit project role"}</h2>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group" style="display: none;">
+                        <label for="inputRoleId" class="col-sm-2 control-label">{_ "Role"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputRoleId" class="form-control" name="role_id" required>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputRole" class="col-sm-2 control-label">{_ "Role"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputRole" class="form-control" name="role" required>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputRoleDescription" class="col-sm-2 control-label">{_ "Description"}</label>
+                        <div class="col-sm-10">
+                            <textarea rows="4" cols="50" id="inputRoleDescription" class="form-control" name="description" value="" required></textarea>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputUsername" class="col-sm-2 control-label">{_ "Username"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputUsername" class="form-control" name="username" placeholder="{_ 'optional'}">
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary">{_ "Save Role"}</button>
+                </div>
+            </div>
+        </div>
+    </form>
+    
+    <form id="add-application" class="modal fade form-horizontal" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/add-application" method="POST">
+        <div class="modal-dialog">    
+            <div class="modal-content">    
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                    <h2 id="add-application-title" class="modal-title"></h2>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group" style="display: none;">
+                        <label for="inputRoleId" class="col-sm-2 control-label">{_ "Role"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputRoleId" class="form-control" name="role_id" required>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputApplication" class="col-sm-2 control-label">{_ "Application"}</label>
+                        <div class="col-sm-10">
+                            <textarea rows="4" cols="50" id="inputApplication" class="form-control" name="application" placeholder="{_ 'optional'}"></textarea>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary">{_ "Apply"}</button>
+                </div>
+            </div>
+        </div>
+    </form>
+    
     <div class="page-header">
         <div class="btn-toolbar pull-right">
             <div class="btn-group">
@@ -12,12 +80,15 @@
                 {if $.User}
                     <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
                     <ul class="dropdown-menu">
+                        <li><a href="#add-role" data-toggle="modal">{_ "Add Role"}</a></li>
                         <li><a href="#add-member" data-toggle="modal">{_ "Add Member"}</a></li>
                         <li><a href="/project-buzz/create?ProjectID={$Project->ID}">{_ "Log Buzz"}</a></li>
                         {if $.User && ($Project->hasMember($.User) || $.Session->hasAccountLevel('Staff'))}
+                            <li><a href="/project-applications/view?ProjectID={$Project->ID}">{_ "Role Applications"}</a></li>
                             <li><a href="#post-update" data-toggle="modal">{_ "Post Update"}</a></li>
                         {/if}
                         {if $.Session->hasAccountLevel('Staff')}
+                            <li><a href="#manage-roles" data-toggle="modal">{_ "Manage Roles"}</a></li>
                             <li><a href="#manage-members" data-toggle="modal">{_ "Manage Members"}</a></li>
                         {/if}
                     </ul>
@@ -158,6 +229,107 @@
                 {/if}
             </div>
                 
+            <!--  PROJECT ROLES BLOCK  -->
+            <h3> Filled Roles</h3>
+            <table id='role_table' width="100%" style="margin-bottom: 10px">
+            {foreach item=Role from=$Project->Roles}
+                {$Person = $Role->Person}
+                    {if $Person}
+                        <tr>
+                            <td rowspan="2" width="70px">
+                                <a
+                                    href="/members/{$Person->Username}"
+                                    class="member-thumbnail"
+                                    data-toggle="tooltip"
+                                    data-placement="bottom"
+                                    title="{projectMemberTitle $Role} {tif $Role->PersonID>0 ? '&mdash;' : '&mdash; Vacant'} {personName $Person}"
+                                >
+                                    {if $Project->MaintainerID == $Person->ID}
+                                        {avatar $Person size=64}
+                                    {else}
+                                        {avatar $Person size=48}
+                                    {/if}
+                                </a>
+                            </td>
+                            <td>
+                                {$Role->Role}
+                            </td>
+                            <td style="text-align:right">
+                                {if $.Session->hasAccountLevel('Staff')}
+                                    {if $Role->PersonID != $Project->MaintainerID}
+                                        <a href="/projects/{$Project->Handle}/change-maintainer?username={$Role->Person->Username|escape:url}" data-toggle="modal" title="Make maintainer" style="margin-left: 4px">
+                                            <span class="glyphicon glyphicon-transfer"></span>
+                                        </a>
+                                    {/if}
+                                    <a href="role" data-toggle="modal" data-role_id="{$Role->ID}" data-role_name="{$Role->Role}" data-role_description="{$Role->Description}" data-role_person="{$Person->Username}" title="Edit Role" style="margin-left: 4px">
+                                        <span class="glyphicon glyphicon-edit"></span>
+                                    </a>
+                                    <a href="/projects/{$Project->Handle}/remove-role?role_id={$Role->ID|escape:url}" data-toggle="modal" title="Trash" style="margin-left: 4px">
+                                        <span class="glyphicon glyphicon-trash"></span>
+                                    </a>
+                                {/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=3>
+                                {personName $Person}
+                            </td>
+                        </tr>
+                    {/if}
+            {foreachelse}
+                <tr>
+                    <td colspan=3>
+                        <span class="muted">{_ "No filled roles"}</span>
+                    </td>
+                </tr>
+            {/foreach}
+            </table>
+            
+            <h3> Vacant Roles</h3>
+            <table id="open_role_table" width="100%">
+            {foreach item=Role from=$Project->Roles}
+                {$Person = $Role->Person}
+                    {if !$Person}
+                        <tr>
+                            <td>
+                                {$Role->Role}
+                            </td>
+                            <td style="text-align:right">
+                                {if $.User}
+                                    <a href="role_application" data-toggle="modal" data-role="{$Role->ID}" data-role_name="{$Role->Role}" data-role_title="{$Project->Title} -- {$Role->Role}" title="Apply" style="margin-left: 4px">
+                                        <span class="glyphicon glyphicon-ok"></span>
+                                    </a>
+                                {/if}
+                                {if $.Session->hasAccountLevel('Staff')}
+                                    <a href="role" data-toggle="modal" data-role_id="{$Role->ID}" data-role_name="{$Role->Role}" data-role_description="{$Role->Description}" data-role_person="{$Person->Username}" title="Edit Role" style="margin-left: 4px">
+                                        <span class="glyphicon glyphicon-edit"></span>
+                                    </a>
+                                    <a href="/projects/{$Project->Handle}/remove-role?role_id={$Role->ID|escape:url}" data-toggle="modal" title="Trash" style="margin-left: 4px">
+                                        <span class="glyphicon glyphicon-trash"></span>
+                                    </a>
+                                {/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=2>
+                                {$Role->Description}
+                            </td>
+                        </tr>
+                    {/if}
+            {foreachelse}
+                <tr>
+                    <td colspan=3>
+                        <span class="muted">{_ "No vacant roles"}</span>
+                    </td>
+                </tr>
+            {/foreach}
+            </table>
+
+            {if $.Session->hasAccountLevel('Staff')}
+                <a class="btn btn-success btn-sm add-person" href="#add-role" data-toggle="modal">+ {_ "Add"}</a>
+            {/if}
+            <hr>
+            
             <!--  MEMBERS BLOCK  -->
             {if $Project->Memberships}
                 <h3>Members</h3>
@@ -229,6 +401,40 @@
 {block js-bottom}
     {$dwoo.parent}
 
+    <form id="add-role" class="modal fade form-horizontal" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/add-role" method="POST">
+        <div class="modal-dialog">    
+            <div class="modal-content">    
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                    <h2 id="add-member-title" class="modal-title">{_ "Add project role"}</h2>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group">
+                        <label for="inputRole" class="col-sm-2 control-label">{_ "Role"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputRole" class="form-control" name="role" required>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputRoleDescription" class="col-sm-2 control-label">{_ "Description"}</label>
+                        <div class="col-sm-10">
+                            <textarea rows="4" cols="50" id="inputRoleDescription" class="form-control" name="description" required></textarea>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="inputUsername" class="col-sm-2 control-label">{_ "Username"}</label>
+                        <div class="col-sm-10">
+                            <input type="text" id="inputUsername" class="form-control" name="username" placeholder="{_ 'optional'}">
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary">{_ "Add Role"}</button>
+                </div>
+            </div>
+        </div>
+    </form>
+    
     <form id="add-member" class="modal fade form-horizontal" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/add-member" method="POST">
         <div class="modal-dialog">    
             <div class="modal-content">    
@@ -280,6 +486,56 @@
     {/if}
 
     {if $.Session->hasAccountLevel('Staff')}
+        <div id="manage-roles" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="manage-roles-title">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                        <h2 id="manage-roles-title" class="modal-title">{_ "Manage project roles"}</h2>
+                    </div>
+                    <div class="modal-body">
+                        <table class="table table-hover">
+                            <thead>
+                                <tr>
+                                    <th>Role</th>
+                                    <th>Description</th>
+                                    <th>Person</th>
+                                    <th><span class="sr-only">Remove Role</span></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {foreach item=Role from=$Project->Roles}
+                                    <tr>
+                                        <td>{$Role->Role}</td>
+                                        <td>{$Role->Description}</td>
+                                        {if $Role->PersonID==null}
+                                            <td>Vacant</td>
+                                        {else}
+                                            <td>{personLink $Role->Person}</td>
+                                        {/if}
+                                        <td width="60px">
+                                            {if $Role->PersonID != $Project->MaintainerID}
+                                                <a href="/projects/{$Project->Handle}/change-maintainer?username={$Role->Person->Username|escape:url}" data-toggle="modal" title="Make maintainer" style="margin-left: 4px">
+                                                    <span class="glyphicon glyphicon-transfer"></span>
+                                                </a>
+                                            {/if}
+                                            <a href="/projects/{$Project->Handle}/remove-role?role_id={$Role->ID|escape:url}" title="Trash" style="margin-left: 4px">
+                                                <span class="glyphicon glyphicon-trash"></span>
+                                            </a>
+                                        </td>
+                                    </tr>
+                                {foreachelse}
+                                    <tr>
+                                        <td class="muted" colspan="4">{_ "None registered"}</td>
+                                    </tr>
+                                {/foreach}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+        
         <div id="manage-members" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="manage-members-title">
             <div class="modal-dialog">
                 <div class="modal-content">
@@ -324,9 +580,6 @@
         </div>
     {/if}
 
-{/block}
-
-{block js-bottom}
     {jsmin "epiceditor.js"}
     {jsmin "pages/project.js"}
 {/block}
diff --git a/html-templates/projects/projects.tpl b/html-templates/projects/projects.tpl
index 37f30536..b8cbaf8a 100644
--- a/html-templates/projects/projects.tpl
+++ b/html-templates/projects/projects.tpl
@@ -24,37 +24,83 @@
     {contentBlock "projects-browse-introduction"}
 
     <div class="row">
-        <div class="col-sm-4 col-md-3 tags-ct">
-            <div class="btn-group btn-group-justified btn-group-xs margin-bottom" role="group">
-                <a href="#projects-by-topic" class="active btn btn-default" role="button" data-group="byTopic">{_ "topics"}</a>
-                <a href="#projects-by-tech" class="btn btn-default" role="button" data-group="byTech">{_ "tech"}</a>
-                <a href="#projects-by-event" class="btn btn-default" role="button" data-group="byEvent">{_ "events"}</a>
-                <a href="#projects-by-event" class="btn btn-default" role="button" data-group="byStage">{_ "stages"}</a>
-            </div>
-
-            {template tagLink tagData rootUrl linkCls=""}
-                <a class="{$linkCls}" href="{$rootUrl}?tag={$tagData.Handle}">{$tagData.Title}{if $tagData.itemsCount} <span class="badge pull-right">{$tagData.itemsCount|number_format}</span>{/if}</a>
-            {/template}
+        <div class="col-sm-4 col-md-3">
+            
+            <form id="add-application" class="" tabindex="-1" role="dialog" aria-labelledby="add-member-title" action="/projects/{$Project->Handle}/add-application" method="POST">
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Commenting" checked>
+                        <b>{_ Commenting}</b>: {Laddr\Project::getStageDescription(Commenting)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Bootstrapping" checked>
+                        <b>{_ Bootstrapping}</b>: {Laddr\Project::getStageDescription(Bootstrapping)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Prototyping" checked>
+                        <b>{_ Prototyping}</b>: {Laddr\Project::getStageDescription(Prototyping)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Testing" checked>
+                        <b>{_ Testing}</b>: {Laddr\Project::getStageDescription(Testing)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Maintaining" checked>
+                        <b>{_ Maintaining}</b>: {Laddr\Project::getStageDescription(Maintaining)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Drifting" checked>
+                        <b>{_ Drifting}</b>: {Laddr\Project::getStageDescription(Drifting)}
+                    </label>
+                </div>
+                <div class="radio list-group">
+                    <label>
+                        <input type="checkbox" name="stage[]" value="Hibernating">
+                        <b>{_ Hibernating}</b>: {Laddr\Project::getStageDescription(Hibernating)}
+                    </label>
+                </div>
+                <div class="">
+                        <button class="btn btn-primary">{_ "Apply"}</button>
+                </div>
+            </form>
 
-            <div class="tags list-group byTopic">
-                {foreach item=tag from=$projectsTags.byTopic}
-                    {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
-                {/foreach}
-            </div>
-            <div class="tags list-group byTech" style="display: none">
-                {foreach item=tag from=$projectsTags.byTech}
-                    {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
-                {/foreach}
-            </div>
-            <div class="tags list-group byEvent" style="display: none">
-                {foreach item=tag from=$projectsTags.byEvent}
-                    {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
-                {/foreach}
-            </div>
-            <div class="tags list-group byStage" style="display: none">
-                {foreach item=stage from=$projectsStages}
-                    <a class="list-group-item" href="/projects?stage={$stage.Stage}">{$stage.Stage} <span class="badge pull-right">{$stage.itemsCount|number_format}</span></a>
-                {/foreach}
+        
+            <div class="tags-ct">
+                <div class="btn-group btn-group-justified btn-group-xs margin-bottom" role="group">
+                    <a href="#projects-by-topic" class="active btn btn-default" role="button" data-group="byTopic">{_ "topics"}</a>
+                    <a href="#projects-by-tech" class="btn btn-default" role="button" data-group="byTech">{_ "tech"}</a>
+                    <a href="#projects-by-event" class="btn btn-default" role="button" data-group="byEvent">{_ "events"}</a>
+                </div>
+    
+                {template tagLink tagData rootUrl linkCls=""}
+                    <a class="{$linkCls}" href="{$rootUrl}?tag={$tagData.Handle}">{$tagData.Title}{if $tagData.itemsCount} <span class="badge pull-right">{$tagData.itemsCount|number_format}</span>{/if}</a>
+                {/template}
+    
+                <div class="tags list-group byTopic">
+                    {foreach item=tag from=$projectsTags.byTopic}
+                        {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
+                    {/foreach}
+                </div>
+                <div class="tags list-group byTech" style="display: none">
+                    {foreach item=tag from=$projectsTags.byTech}
+                        {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
+                    {/foreach}
+                </div>
+                <div class="tags list-group byEvent" style="display: none">
+                    {foreach item=tag from=$projectsTags.byEvent}
+                        {tagLink tagData=$tag rootUrl="/projects" linkCls="list-group-item"}
+                    {/foreach}
+                </div>
             </div>
         </div>
         <div class="col-sm-8 col-md-9">
diff --git a/html-templates/projects/roleAdded.tpl b/html-templates/projects/roleAdded.tpl
new file mode 100644
index 00000000..e715c87d
--- /dev/null
+++ b/html-templates/projects/roleAdded.tpl
@@ -0,0 +1,12 @@
+{extends designs/site.tpl}
+
+{block title}{_ "Roles"} &mdash; {$dwoo.parent}{/block}
+
+{block content}
+    {capture assign=project}{projectLink $Project}{/capture}
+
+    <div class="page-header">
+        <h1>Role Added</h1>
+    </div>
+    <p class="lead">{sprintf(_("%s has been added to %s"), $data->Role, $project)}</p>
+{/block}
\ No newline at end of file
diff --git a/html-templates/projects/roleApplicationAdded.tpl b/html-templates/projects/roleApplicationAdded.tpl
new file mode 100644
index 00000000..1e08c9c1
--- /dev/null
+++ b/html-templates/projects/roleApplicationAdded.tpl
@@ -0,0 +1,12 @@
+{extends designs/site.tpl}
+
+{block title}{_ "Roles"} &mdash; {$dwoo.parent}{/block}
+
+{block content}
+    {capture assign=project}{projectLink $Project}{/capture}
+
+    <div class="page-header">
+        <h1>Application Added</h1>
+    </div>
+    <p class="lead">{sprintf(_(Your application for "%s has been added to %s"), $data->Role, $project)}</p>
+{/block}
\ No newline at end of file
diff --git a/html-templates/projects/roleModified.tpl b/html-templates/projects/roleModified.tpl
new file mode 100644
index 00000000..76ed7c53
--- /dev/null
+++ b/html-templates/projects/roleModified.tpl
@@ -0,0 +1,12 @@
+{extends designs/site.tpl}
+
+{block title}{_ "Roles"} &mdash; {$dwoo.parent}{/block}
+
+{block content}
+    {capture assign=project}{projectLink $Project}{/capture}
+
+    <div class="page-header">
+        <h1>Role Modified</h1>
+    </div>
+    <p class="lead">{sprintf(_("%s has been modified for %s"), $data->Role, $project)}</p>
+{/block}
\ No newline at end of file
diff --git a/html-templates/projects/roleRemoved.tpl b/html-templates/projects/roleRemoved.tpl
new file mode 100644
index 00000000..2052d488
--- /dev/null
+++ b/html-templates/projects/roleRemoved.tpl
@@ -0,0 +1,14 @@
+{extends designs/site.tpl}
+
+{block title}Roles &mdash; {$dwoo.parent}{/block}
+
+{block content}
+<div class="row">
+    <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
+        <div class="page-header">
+            <h1>Role Removed</h1>
+        </div>
+        <p>{if $data && $data->Role}({$data->Role|escape}){/if} has been removed from {projectLink $Project}</p>
+    </div>
+</div>
+{/block}
\ No newline at end of file
diff --git a/php-classes/Laddr/Project.php b/php-classes/Laddr/Project.php
index 2bac0ec7..95204fff 100644
--- a/php-classes/Laddr/Project.php
+++ b/php-classes/Laddr/Project.php
@@ -85,6 +85,27 @@ class Project extends \VersionedRecord
             'linkForeign' => 'MemberID',
             'indexField' => 'ID'
         ],
+        'Roles' => [
+            'type' => 'one-many',
+            'class' => ProjectRole::class,
+            'foreign' => 'ProjectID'
+        ],
+        'OpenRoles' => [
+            'type' => 'one-many',
+            'class' => ProjectRole::class,
+            'foreign' => 'ProjectID',
+            'conditions' => [
+                'PersonID IS NULL'
+            ]
+        ],
+        'FilledRoles' => [
+            'type' => 'one-many',
+            'class' => ProjectRole::class,
+            'foreign' => 'ProjectID',
+            'conditions' => [
+                'PersonID IS NOT NULL'
+            ]
+        ],
         'Memberships' => [
             'type' => 'one-many',
             'class' => ProjectMember::class,
@@ -143,6 +164,7 @@ class Project extends \VersionedRecord
     public static $dynamicFields = [
         'Maintainer',
         'Members',
+        'Roles',
         'Memberships',
         'Tags',
         'TopicTags',
@@ -193,9 +215,9 @@ public function save($deep = true)
         parent::save($deep);
 
         if (!$this->Members) {
-            ProjectMember::create([
+            ProjectRole::create([
                 'ProjectID' => $this->ID,
-                'MemberID' => $this->Maintainer->ID,
+                'PersonID' => $this->Maintainer->ID,
                 'Role' => 'Founder' // _("Founder") -- placeholder to make this string translatable, actual translation is done during rendering though
             ], true);
         }
diff --git a/php-classes/Laddr/ProjectRole.php b/php-classes/Laddr/ProjectRole.php
new file mode 100644
index 00000000..d00c9bcc
--- /dev/null
+++ b/php-classes/Laddr/ProjectRole.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Laddr;
+
+use Emergence\People\Person;
+
+
+class ProjectRole extends \ActiveRecord
+{
+    // ActiveRecord configuration
+    public static $tableName = 'project_roles'; // the name of this model's table
+
+    // controllers will use these values to figure out what templates to use
+    public static $singularNoun = 'project role'; // a singular noun for this model's object
+    public static $pluralNoun = 'project roles'; // a plural noun for this model's object
+
+    // gets combined with all the extended layers
+    public static $fields = [
+        'ProjectID' => 'uint',
+        'PersonID' => [
+            'type' =>'uint',
+            'default'=>null
+        ],
+        'Role' => 'string',
+        'Description' => [
+            'type' =>'string',
+            'default'=>null
+        ]
+    ];
+
+    public static $relationships = [
+        'Project' => [
+            'type' => 'one-one',
+            'class' => Project::class
+        ],
+        'Person' => [
+            'type' => 'one-one',
+            'class' => Person::class
+        ]
+    ];
+
+    public static $dynamicFields = [
+        'Project',
+        'Person'
+    ];
+}
diff --git a/php-classes/Laddr/ProjectsRequestHandler.php b/php-classes/Laddr/ProjectsRequestHandler.php
index 677894ef..67365f1a 100644
--- a/php-classes/Laddr/ProjectsRequestHandler.php
+++ b/php-classes/Laddr/ProjectsRequestHandler.php
@@ -18,6 +18,14 @@ class ProjectsRequestHandler extends \RecordsRequestHandler
     public static function handleRecordRequest(\ActiveRecord $Project, $action = false)
     {
         switch ($action ? $action : $action = static::shiftPath()) {
+            case 'add-role':
+                return static::handleAddRoleRequest($Project);
+            case 'modify-role':
+                return static::handleModifyRoleRequest($Project);
+            case 'remove-role':
+                return static::handleRemoveRoleRequest($Project);
+            case 'add-application':
+                return static::handleAddRoleApplicationRequest($Project);
             case 'add-member':
                 return static::handleAddMemberRequest($Project);
             case 'remove-member':
@@ -48,7 +56,10 @@ public static function handleBrowseRequest($options = [], $conditions = [], $res
 
         // apply stage filter
         if (!empty($_REQUEST['stage'])) {
-            $conditions['Stage'] = $_REQUEST['stage'];
+            $conditions['Stage'] = [
+                'operator' => 'in',
+                'values' => is_array($_REQUEST['stage']) ? $_REQUEST['stage'] : explode(',', $_REQUEST['stage'])
+            ];
         }
 
         $responseData['projectsTotal'] = Project::getCount();
@@ -84,6 +95,129 @@ public static function handleBrowseRequest($options = [], $conditions = [], $res
         return parent::handleBrowseRequest($options, $conditions, $responseID, $responseData);
     }
 
+    public static function handleAddRoleRequest(Project $Project)
+    {
+        $GLOBALS['Session']->requireAuthentication();
+
+        $Person = User::getByUsername($_POST['username']);
+
+        $recordData = [
+            'ProjectID' => $Project->ID,
+            'PersonID' => (!$Person)?null:$Person->ID
+        ];
+
+        $ProjectRole = ProjectRole::create($recordData);
+
+        if (!empty($_POST['role'])) {
+            $ProjectRole->Role = $_POST['role'];
+        }
+        
+        if (!empty($_POST['description'])) {
+            $ProjectRole->Description = $_POST['description'];
+        }
+
+        $ProjectRole->save();
+
+        return static::respond('roleAdded', [
+            'data' => $ProjectRole,
+            'Project' => $Project,
+            'Member' => $Person
+        ]);
+    }
+    
+    public static function handleModifyRoleRequest(Project $Project)
+    {
+        $GLOBALS['Session']->requireAuthentication();
+
+        $Person = User::getByUsername($_POST['username']);
+
+        $recordData = [
+            'ProjectID' => $Project->ID,
+            'PersonID' => (!$Person)?null:$Person->ID
+        ];
+
+        $ProjectRole = ProjectRole::create($recordData);
+
+        if (!empty($_POST['role'])) {
+            $ProjectRole->Role = $_POST['role'];
+        }
+        
+        if (!empty($_POST['description'])) {
+            $ProjectRole->Description = $_POST['description'];
+        }
+
+        $ProjectRole->save();
+
+        return static::respond('roleModified', [
+            'data' => $ProjectRole,
+            'Project' => $Project,
+            'Member' => $Person
+        ]);
+    }
+    
+    public static function handleAddRoleApplicationRequest(Project $Project){
+        $GLOBALS['Session']->requireAuthentication();
+        
+        $Person = User::getByUsername($_POST['username']);
+
+        $recordData = [
+            'ProjectID' => $Project->ID,
+            'PersonID' => (!$Person)?null:$Person->ID,
+            'Status' => 'Pending'
+        ];
+
+        $RoleApplication = RoleApplication::create($recordData);
+
+        if (!empty($_POST['role'])) {
+            $RoleApplication->RoleID = $_POST['role'];
+        }
+        
+        if (!empty($_POST['application'])) {
+            $RoleApplication->Application = $_POST['application'];
+        }
+
+        $RoleApplication->save();
+
+        return static::respond('roleAdded', [
+            'data' => $RoleApplication,
+            'Project' => $Project,
+            'Member' => $Person
+        ]);
+    }
+    
+    public static function handleRemoveRoleRequest(Project $Project)
+    {
+        $GLOBALS['Session']->requireAuthentication();
+
+        if (empty($_REQUEST['role_id'])) {
+            return static::throwError(_('Parameter "role_id" required'));
+        }
+        
+        $ProjectRole = ProjectRole::getByWhere([
+            'ProjectID' => $Project->ID,
+            'ID' => $_REQUEST['role_id']
+        ]);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            return static::respond('confirm', [
+                'question' => sprintf(
+                    _('Are you sure you want to remove %s from %s?'),
+                    htmlspecialchars($ProjectRole->Role),
+                    htmlspecialchars($Project->Title)
+                )
+            ]);
+        }
+
+        if ($ProjectRole) {
+            $ProjectRole->destroy();
+        }
+
+        return static::respond('roleRemoved', [
+            'data' => $ProjectRole,
+            'Project' => $Project
+        ]);
+    }
+    
     public static function handleAddMemberRequest(Project $Project)
     {
         $GLOBALS['Session']->requireAuthentication();
diff --git a/php-classes/Laddr/RoleApplication.php b/php-classes/Laddr/RoleApplication.php
new file mode 100644
index 00000000..1e7832d1
--- /dev/null
+++ b/php-classes/Laddr/RoleApplication.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Laddr;
+
+use Emergence\People\Person;
+
+
+class RoleApplication extends \ActiveRecord
+{
+    // ActiveRecord configuration
+    public static $tableName = 'role_applications'; // the name of this model's table
+
+    // controllers will use these values to figure out what templates to use
+    public static $singularNoun = 'role application'; // a singular noun for this model's object
+    public static $pluralNoun = 'role applications'; // a plural noun for this model's object
+
+    // gets combined with all the extended layers
+    public static $fields = [
+        'ProjectID'   => 'uint',
+        'PersonID'    => 'uint',
+        'RoleID'      => 'uint',
+        'Application' => 'string',
+        'Status'      => [
+            'type' => 'enum',
+            'values' => [
+                'Pending',
+                'Accepted',
+                'Rejected'
+            ],
+            'default' => 'Pending'
+        ]
+    ];
+
+    public static $relationships = [
+        'Project' => [
+            'type' => 'one-one',
+            'class' => Project::class
+        ],
+        'Person' => [
+            'type' => 'one-one',
+            'class' => Person::class
+        ],
+        'ProjectRole' => [
+            'type' => 'one-one',
+            'class' => ProjectRole::class
+        ]
+    ];
+    
+    public static $indexes = [
+        'ProjectRoleApplication' => [
+            'fields' => ['ProjectID', 'PersonID', 'RoleID'],
+            'unique' => true
+        ]
+    ];
+
+    public static $dynamicFields = [
+        'Project',
+        'Person',
+        'Role'
+    ];
+}
\ No newline at end of file
diff --git a/site-root/js/pages/project.js b/site-root/js/pages/project.js
index 8552489d..141fa79b 100644
--- a/site-root/js/pages/project.js
+++ b/site-root/js/pages/project.js
@@ -32,4 +32,26 @@
             epicEditor.importFile('README', $textarea.val());
         });
     });
-})();
\ No newline at end of file
+})();
+
+$( "#open_role_table" ).on( "click", "a[title^='Apply']", function( event ) {
+    $('#add-application').modal({show: 'true'});
+    $("#add-application-title").text($( this ).attr( "data-role_name"));
+    $("#inputRoleId").val($( this ).attr( "data-role_id"));
+});
+
+$( "#open_role_table" ).on( "click", "a[title^='Edit Role']", function( event ){
+    $('#modify-role').modal({show: 'true'});
+    $("#inputRoleId").val($( this ).attr( "data-role_id"));
+    $("#inputRole").val($( this ).attr( "data-role_name"));
+    $("#inputRoleDescription").val($( this ).attr( "data-role_description"));
+    $("#inputUsername").val($( this ).attr( "data-role_person"));
+});
+
+$( "#role_table" ).on( "click", "a[title^='Edit Role']", function( event ) {
+    $('#modify-role').modal({show: 'true'});
+    $("#inputRoleId").val($( this ).attr( "data-role_id"));
+    $("#inputRole").val($( this ).attr( "data-role_name"));
+    $("#inputRoleDescription").val($( this ).attr( "data-role_description"));
+    $("#inputUsername").val($( this ).attr( "data-role_person"));
+});
\ No newline at end of file