diff --git a/.travis.yml b/.travis.yml
index 2de36029c..b604be88a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ branches:
   only:
     - master
     - /quarter\d*/
+    - develop
+    - /2.\d*.\d*/
 env:
 - TEST_SUITE=rspec
 - TEST_SUITE=cucumber
diff --git a/app/assets/javascripts/transam_core/flyout.js b/app/assets/javascripts/transam_core/flyout.js
new file mode 100644
index 000000000..49e438fbb
--- /dev/null
+++ b/app/assets/javascripts/transam_core/flyout.js
@@ -0,0 +1,24 @@
+// function closeFlyout() {
+//     for(var elem of document.getElementsByClassName("closeFlyout")){
+//         elem.addEventListener("click", function(){
+//             this.form.reset();
+//         });
+//     }
+// }
+
+
+function createFlyout(elem, before, append) {
+    $(document).ready(function(){
+        before;
+        $(elem + ":empty").append(append);
+    });
+}
+
+function toggleExtend(trigger, elem, isRight) {
+    if (isRight) {
+        $(trigger).on('click', function() {$(elem).toggleClass( "extend-right" )});
+    }  else {
+        $(trigger).on('click', function() {$(elem).toggleClass( "extend-left" )});
+        elem.scrollLeft = window.innerWidth;
+    }
+}
\ No newline at end of file
diff --git a/app/assets/javascripts/transam_core/table-library/export.js b/app/assets/javascripts/transam_core/table-library/export.js
new file mode 100644
index 000000000..bac5eabc9
--- /dev/null
+++ b/app/assets/javascripts/transam_core/table-library/export.js
@@ -0,0 +1,86 @@
+$(document).on('click', ".export_option", function(event){
+  event.stopPropagation();
+  const id = $(this).closest(".library-table").find("table").eq(0).attr('id');
+  if($(this).text().trim() === "csv") {
+    $(this).attr({ 'download': "output.csv", 'href': export_table(id, $(this).text().trim()), 'target': '_blank' });
+  } else if($(this).text().trim() === "txt") {
+    $(this).attr({ 'download': "output.txt", 'href': export_table(id, $(this).text().trim()), 'target': '_blank' });
+  } else if($(this).text().trim() === "excel") {
+    $(this).attr({ 'download': "output.xls", 'href': export_table(id, $(this).text().trim()), 'target': '_blank' });
+  }
+  $(this).closest('.export').eq(0).removeClass("open");
+});
+
+
+
+
+
+function export_table(id, type) {
+  const table = $('#'+id);
+  const header = table.find("tr:has(th)").eq(0).find(".header-item:not(.header-checkbox)");
+  let rows = [];
+  if($('#' + id + '_export_checkbox').is(':checked')) {
+    rows = table.find(".row-checked:has(td)");
+  } else {
+    rows = table.find("tr:has(td)");
+  }
+  let csv = "";
+  for(let cell of header){
+    csv = csv + $(cell).find(".header-text").text().replace(/,/g, '') + ",";
+  }
+  csv = csv + '\n';
+  for(let row of rows){
+    for(let c of $(row).find(".row-item")) {
+      if($(c).hasClass("action-column")) {
+        continue;
+      } else if($(c).hasClass("checkmark-column")) {
+        csv = csv + (($(c).find(".cell-text i").css("visibility") == "visible")? "Yes,": "No,");
+      } else {
+        csv = csv + $(c).find(".cell-text").text().replace(/,/g, '') + ",";
+      }
+    }
+    csv = csv + '\n';
+  }
+  if(type === "csv") {
+    csvData = 'data:application/csv;charset=utf-8,' + encodeURIComponent(csv);
+    return csvData;
+  } else if(type === "txt") {
+    csvData = 'data:application/txt;charset=utf-8,' + encodeURIComponent(csv);
+    return csvData;
+  } else if(type === "excel") {
+    csvData = 'data:application/xls;charset=utf-8,' + encodeURIComponent(csv);
+    return csvData;
+  }
+  
+}
+
+function init_export(id, types) {
+  const table = $('#'+id);
+  $(document).ready(function(){
+    let wrapper = $('<div class="export">');
+    let button = $('<div class=" function_button export_button">').append('<i class="fas fa-file-download button-label button-icon" aria-hidden="true">');
+    let options = $('<div class="export_options">');
+    let selected_rows_checkbox = $('<div class="selected_rows_checkbox_wrapper">').append($('<input type="checkbox" class="selected_rows_checkbox" id="' + id + '_export_checkbox">')).append($('<label class="selected_rows_checkbox_label" for="' + id + '_export_checkbox">').text("Selected Rows Only"));
+    $(document).on('click', ".export", function(event){
+      event.stopPropagation();
+      event.stopImmediatePropagation();
+      $(this).toggleClass("open");
+    });
+    options.append($('<div class="export_label">').text("Export Data"));
+    options.append(selected_rows_checkbox);
+    for(let type of types){
+      options.append($('<a class="export_option">').text(type).prepend('<i class="fas fa-file-download button-label button-icon" aria-hidden="true">'));
+    }
+    wrapper.append(button).append(options);
+    table.parent().find(".function_bar").append(wrapper);
+    
+  });
+}
+
+
+// close on click away
+$(document).on('click', function(e){
+  if($(e.target).closest('.open').length === 0) {
+    $('.open').removeClass('open');
+  }
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/transam_core/table-library/main.js b/app/assets/javascripts/transam_core/table-library/main.js
new file mode 100644
index 000000000..6275d0975
--- /dev/null
+++ b/app/assets/javascripts/transam_core/table-library/main.js
@@ -0,0 +1,380 @@
+$("table[use]").ready(()=>{
+
+    $("table[use]").each(async function(i, value){
+
+        $(this).addClass('loading');
+        if($(value).attr('use') == 'true'){
+            const id = $(value).attr('id');
+            const table_code = $(value).data('tableCode');
+            const side = $(value).data('side');
+            const export_types = $(value).data('export').replace(/[\[\]']+/g,'').split(',');
+            let curPage = $(value).data('currentPage');
+            let curPageSize = $(value).data('currentPageSize');
+            const pageSizes = $(value).data('pageSizes').split(',');
+            const columns = $(value).data('columns');
+            let selected_columns = $(value).data('selectedColumns').split(',');
+            const col_names = {};
+            const col_types = {};
+            const col_widths = {};
+            for(let col of Object.keys(columns)){
+                let x = columns[col];
+                col_names[col] = x["name"];
+                col_types[col] = x["type"];
+                col_widths[col] = x["width"];
+            }
+            window[id].col_names = col_names;
+            window[id].col_types = col_types;
+            window[id].col_widths = col_widths;
+            window[id].col_selected = selected_columns;
+            const search = $(value).data('search');
+            const url = $(value).data('url');
+            const sort = $(value).data('sort');
+            let sort_params = [];
+            await $.ajax({
+                type: "GET",
+                contentType: "application/json; charset=utf-8",
+                data:{"table_code":table_code},
+                url: "/users/table_preferences?",
+                success: function(data){
+                  if(data) {
+                    sort_params = data["sort"];
+                    //     .reduce((obj,item)=>{
+                    //     key=Object.keys(item)[0];
+                    //     obj[key]=item[key];return obj;
+                    // }, {});
+                  }
+                },
+                dataType: "json"
+            });
+            window[id].sort_params = sort_params;
+            let params = $(value).data('params');
+
+            initialize(id, selected_columns, curPage, curPageSize, pageSizes, side, url, params, sort, export_types);
+
+            if(search == 'client') {
+                addSearch(id);
+            } else if(search === 'server') {
+                addSearchServer(id);
+            }
+        }
+    });
+
+    $(document).on('click', '.cell-checkbox input[type="checkbox"]', function(){
+        $(this.parentNode.parentNode.parentNode).toggleClass("row-checked");
+    });
+
+    // $(document).on('click', '.header-checkbox input[type="checkbox"]', function(){
+    //     let table = $(this).closest('.library-table').find("table").eq(0);
+    //     table.find('.cell-checkbox input').click();
+    // });
+    $(document).on('click', '.header-checkbox input[type="checkbox"]:checked', function(){
+        let table = $(this).closest('.library-table').find("table").eq(0);
+        table.find('.table-row').addClass("row-checked").find(".cell-checkbox label input").prop( "checked", true);
+    });
+    $(document).on('click', '.header-checkbox input[type="checkbox"]:not(:checked)', function(){
+        let table = $(this).closest('.library-table').find("table").eq(0);
+        table.find('.table-row').removeClass("row-checked").find(".cell-checkbox label input").prop( "checked", false);
+    });
+});
+
+
+async function initialize(id, selected, curPage, curPageSize, pageSizes, side, url, params, sort, export_types) {
+    $('#'+id).parent().prepend($('<div class="function_bar">'));
+    $('#'+id).append($("<tbody>"));
+    if(side === 'server') {
+        pagination(id, curPage, curPageSize, pageSizes, -1);
+        init_export(id, export_types);
+        // clear_row_queue(id);
+        updatePage(id, curPage, curPageSize, -1, false, params);
+        applyIcons($('#'+id).find('.header'));
+        return;
+    }
+    
+    updateHeader(id, selected, sort);
+    pagination(id, curPage, curPageSize, pageSizes);
+    init_export(id, export_types);
+    clear_row_queue(id);
+    updatePage_help(id, curPage, curPageSize);
+    clear_aux_queue(id);
+    client_sort($('#'+id).find('.header-item[code="'+ Object.keys(window[id].sort_params[0])[0] +'"]'));
+
+    
+
+}
+
+
+function updateHeader(id, selected, sort){
+  let cols = window[id].col_names;
+  let col_ts = window[id].col_types;
+  let col_ws = window[id].col_widths;
+  let sort_params = window[id].sort_params;
+  if($('#'+id + " thead").length < 1){
+    let table = $("#" + id);
+    let header = $('<tr>').addClass("header");
+    let colgroup = $('<colgroup>');
+    header.append($('<th>').addClass("header-item header-checkbox").append($('<label>').append($('<input>').attr('type', "checkbox").addClass("header-checkbox")).append($('<span>').addClass('fa-stack').append($('<i class="fad fa-square fa-stack-1x" aria-hidden="true"></i>')).append($('<i class="fas fa-check-square fa-stack-1x" aria-hidden="true"></i>')))));
+    colgroup.append($('<col>').addClass('col-item').attr('style', 'width: 32px'));
+    // let sort_select = $('<div>');
+    for (let col of selected){
+        try {
+            header.append($('<th>').addClass('header-item').attr("code", col).attr("type", col_ts[col])//.attr("order", sort_params[col])
+                    .append($('<div>').addClass('header-content')
+                      .append($('<div>').addClass('header-text').text(cols[col].toString()))
+                      .append($('<div>').addClass('header-icons'))));
+
+            colgroup.append(
+                $('<col>').addClass('col-item').css("width", col_ws[col]));
+            $("#" + id + " .table-row>:nth-child(" +  ($("[type|='" + col_ts[col] + "']").eq(0).index()+1) + ")").addClass(col_ts[col]);
+
+        } catch (e) {
+            header.append($('<th>').addClass('header-item').attr("type", "")
+                    .append($('<div>').addClass('header-content').text(cols[col].toString())
+                      .append($('<div>').addClass('header-text').text(cols[col].toString()))
+                      .append($('<div>').addClass('header-icons'))));  
+        }
+        if (sort === "client") {
+            // sort_select.append($('<form id='+col+'_select>').text(cols[col].toString())
+            //     .append($('<input id="'+col+'_asc">').attr("type", "radio").attr("form", col+'_select').attr("name", col+'_select')).append($('<label>').attr("for",col+"_asc").text("Ascending"))
+            //     .append($('<input id="'+col+'_desc">').attr("type", "radio").attr("form", col+'_select').attr("name", col+'_select')).append($('<label>').attr("for",col+"_desc").text("Descending")));
+        }
+
+
+
+        // header.append($('<th>').addClass('header-item').attr('col_type', col_ts[i].toString()).append($('<div>').addClass('header-content').text(cols[i].toString())));
+        // colgroup.append($('<col>').addClass('col-item').attr('style', 'width: '+ col_ws[i].toString()));
+    }
+    if(sort_params.length > 0){
+        let col = Object.keys(sort_params[0])[0];
+        header.find('.header-item[code='+ col +']').attr("order", sort_params[0][col]);
+    }
+    applyIcons(header);
+    table.prepend($('<thead>').append(header)).prepend(colgroup);
+    // table.parent().append(sort_select);
+  } else {
+    
+  }
+}
+
+function applyIcons(header) {
+    $(header).children().each((i,cell)=>{
+        if ($(cell).attr("order") === "ascending") {
+          $(cell).removeClass("sorted-desc").addClass("sorted sorted-asc");
+          $(cell).find(".header-icons").empty().append($('<span>').addClass("sort icon")
+                                  .append($('<i>').addClass("fad fa-sort-amount-down-alt sorted asc"))
+                                  .append($('<i>').addClass("fad fa-sort-amount-up sorted desc")));
+        } else if ($(cell).attr("order") === "descending") {
+          $(cell).removeClass("sorted-asc").addClass("sorted sorted-desc");
+          $(cell).find(".header-icons").empty().append($('<span>').addClass("sort icon")
+                                  .append($('<i>').addClass("fad fa-sort-amount-down-alt sorted asc"))
+                                  .append($('<i>').addClass("fad fa-sort-amount-up sorted desc")));
+        } else {
+          $(cell).removeClass("sorted sorted-desc sorted-asc").addClass("unsorted");
+          $(cell).find(".header-icons").empty().append($('<span>').addClass("sort icon")
+                                  .append($('<i>').addClass("fas fa-long-arrow-alt-up"))
+                                  .append($('<i>').addClass("fas fa-long-arrow-alt-down")));
+        }
+    });
+
+
+}
+
+function clear_row_queue(id){
+    if(typeof window[id].table_rows !== "undefined" && window[id].table_rows.length > 0)
+        for(let f of window[id].table_rows) {f();}
+}
+
+
+function add_row(id, vals, index) {
+    try{
+        window[id].table_rows.push(function(){
+            add_row_exec(id, vals, index);
+        });
+    } catch (e) {
+        window[id].table_rows = [];
+        window[id].table_rows.push(function(){
+            add_row_exec(id, vals, index);
+        });
+    }
+    
+}
+
+
+
+
+
+function add_row_exec(id, vals, index) {
+    if(!($('#' + id + " .table-row[index=" + index + ']').length > 0)){
+        let row = $('<tr>').addClass('table-row').attr("index", index.toString());
+        let checkbox = $('<td>').addClass("cell-checkbox").append($('<label>').append($('<input>').attr('type', "checkbox")).append($('<span>').addClass('fa-stack').append($('<i class="fad fa-square fa-stack-1x" aria-hidden="true"></i>')).append($('<i class="fas fa-check-square fa-stack-1x" aria-hidden="true"></i>'))));
+        row.append(checkbox);
+        // TODO: TEMP, stilll working on this
+        let s_cols = window[id].col_selected;
+        let col_names = window[id].col_names;
+        let col_types = window[id].col_types;
+        
+        for(let key of s_cols){
+            // let i = col_names.indexOf(key.trim());
+            row.append($('<td>').addClass("row-item").addClass(col_types[key.trim()]).append($('<div>').addClass('cell-text').html(vals[key.trim()])));
+            //$('#'+id+" .header-item:nth-child(" + col_types[i] + ")").attr("type")
+        }
+        // messy way of inserting each row at correct position
+        let lt = $('#' + id + " .table-row").filter(function(){
+            return $(this).attr("index") < index;
+        });
+        (lt.length > 0) ? row.insertAfter(lt[lt.length-1]) : $('#' + id).prepend(row);
+    } else {
+        
+    }
+
+}
+
+
+async function add_aux_queue(id, func){
+    try{
+        window[id].aux_queue.push(function(){
+            func();
+        });
+    } catch (e) {
+        window[id].aux_queue = [];
+        window[id].aux_queue.push(function(){
+            func();
+        });
+    }
+}
+
+function clear_aux_queue(id){
+    if(typeof window[id].aux_queue !== "undefined" && window[id].aux_queue.length > 0)
+        for(let f of window[id].aux_queue) {f();}
+}
+
+
+async function serverSide(id, url, curPage, curPageSize, params, search="", sort_by={}) {
+        $('#'+id).addClass('loading');
+        let response = {};
+        let data = {'page': curPage, 'page_size': curPageSize, 'search': search};
+        if(!$.isEmptyObject(sort_by)) { // asumes 1 column
+            data['sort_column'] = Object.keys(sort_by[0])[0];
+            data['sort_order'] = Object.values(sort_by[0])[0]; 
+            $('#'+id).find('.table-row').remove(); // clear out table
+        }
+        for(let x in params){ data[x] = params[x]; }
+        await $.ajax({
+            type: "GET",
+            contentType: "application/json; charset=utf-8",
+            url: url,
+            data : data,
+            dataType: "json",
+            beforeSend:(xhr) => {
+                // console.log(window[id].activeRequest);
+                if(window[id].activeRequest && window[id].activeRequest.readyState !== 4) {
+                    // console.log("abort: ", window[id].activeRequest);
+                    // console.log("keep: ", xhr);
+                    window[id].activeRequest.abort();
+                }
+                window[id].activeRequest = xhr;
+            },
+            success: (d, s, xhr)=> {
+                response = d;
+            },
+            complete: (jqXHR, status) => {
+                // console.log(status);
+                if(status == 'success') {
+                    r = response;
+                    try {
+                    r_columns = Object.keys(r['rows'][0]); 
+                    window[id].col_selected = r_columns;
+                    updateHeader(id, r_columns, "server");
+                    } catch (e) {
+                    updateHeader(id, window[id].col_selected, "server");
+                    }
+                    for(let [index,obj] of r['rows'].entries()) {
+                        let row = {};
+                        let columns = Object.keys(obj);
+                        for(let col of columns) {
+                            if(!obj[col]["url"] || 0 === obj[col]["url"].trim().length) {
+                                row[col] = obj[col]["data"];
+                            } else {
+                                row[col] = "<a href='" + obj[col]["url"] + "'>" + obj[col]["data"] + "</a>";
+                            }
+                        }
+                        add_row_exec(id, row, (curPage * curPageSize)+index);
+                    }
+                }
+            },
+            error: function (){
+                // console.log("error");
+                return -1;
+            }
+        });
+
+
+
+        return response['count'];
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// function server_side_exec(id, r, curPage, curPageSize) 
+
+
+// statusCode: {
+//     500: async function(){
+//         console.log("handling 500");
+//         // retry without sorting
+//         data['sort_column'] = "asset_id"; // what sould the default be? 
+//         data['sort_order'] = "ascending"; //  how would we determine a good guess?
+//         $('#'+id+' .header-item').attr("order", "");
+//         await $.ajax({
+//             type: "GET",
+//             contentType: "application/json; charset=utf-8",
+//             url: url,
+//             data : data,
+//             dataType: "json",
+//             complete: (r) => {
+//                 response = r;
+//                 try {
+//                   r_columns = Object.keys(r['rows'][0]); 
+//                   window[id].col_selected = r_columns;
+//                   updateHeader(id, r_columns, "server");
+//                 } catch (e) {
+//                   updateHeader(id, window[id].col_selected, "server");
+//                 }
+//                 for(let [index,obj] of r['rows'].entries()) {
+//                     let row = {};
+//                     let columns = Object.keys(obj);
+//                     for(let col of columns) {
+//                         if(!obj[col]["url"] || 0 === obj[col]["url"].trim().length) {
+//                             row[col] = obj[col]["data"];
+//                         } else {
+//                             row[col] = "<a href='" + obj[col]["url"] + "'>" + obj[col]["data"] + "</a>";
+//                         }
+//                     }
+//                     add_row_exec(id, row, (curPage * curPageSize)+index);
+//                 }
+//             },
+//             error: function (){
+//             }
+//         });
+//     }
+// },
\ No newline at end of file
diff --git a/app/assets/javascripts/transam_core/table-library/pagination.js b/app/assets/javascripts/transam_core/table-library/pagination.js
new file mode 100644
index 000000000..e07fec54c
--- /dev/null
+++ b/app/assets/javascripts/transam_core/table-library/pagination.js
@@ -0,0 +1,245 @@
+$(document).on('click', ".page-select-item:not(.search-result-page)", function(){
+    let table = $(this).closest('.library-table').find("table").eq(0);
+    updatePage_help(table.attr('id'), $(this).text()-1, table.data('currentPageSize'));
+});
+
+$(document).on('click', ".page-select-item.search-result-page", function(){
+    let table = $(this).closest('.library-table').find("table").eq(0);
+    updatePage_help(table.attr('id'), $(this).text()-1, table.data('currentPageSize'), true);
+});
+
+$(document).on('click', ".page-select-arrow-left", function(){
+    let table = $(this).closest('.library-table').find("table").eq(0);
+
+    if ($(this).parent().find(".search-result-page").length > 0){
+        updatePage_help(table.attr('id'), table.data("currentPage") - 1, table.data('currentPageSize'), true);
+    } else {
+        updatePage_help(table.attr('id'), table.data("currentPage") - 1, table.data('currentPageSize'));
+
+    }
+});
+
+$(document).on('click', ".page-select-arrow-right", function(){
+    let table = $(this).closest('.library-table').find("table").eq(0);
+    let cur = $(".page-selected").index();
+    if ($(this).parent().find(".search-result-page").length > 0){
+        updatePage_help(table.attr('id'), table.data("currentPage") + 1, table.data('currentPageSize'), true);
+    } else {
+        updatePage_help(table.attr('id'), table.data("currentPage") + 1, table.data('currentPageSize'));
+
+    }
+});
+
+$(document).on('click', ".page-select-arrow-left-full", function(){
+    let table = $(this).closest('.library-table').find("table").eq(0);
+
+    if ($(this).parent().find(".search-result-page").length > 0){
+        updatePage_help(table.attr('id'), 0, table.data('currentPageSize'), true);
+    } else {
+        updatePage_help(table.attr('id'), 0, table.data('currentPageSize'));
+
+    }
+});
+
+$(document).on('click', ".page-select-arrow-right-full", function(){
+    let table = $(this).closest('.library-table').find("table").eq(0);
+    if ($(this).parent().find(".search-result-page").length > 0){
+        updatePage_help(table.attr('id'), $(this).parent().find(".page-select-item:last-child").text()-1, table.data('currentPageSize'), true);
+    } else {
+        updatePage_help(table.attr('id'), $(this).parent().find(".page-select-item:last-child").text()-1, table.data('currentPageSize'));
+    }
+});
+
+$(document).on('change', ".page-size-dropdown", function(){
+    let table = $(this).closest('.library-table').find("table").eq(0);
+    updatePage_help(table.attr('id'), 0, parseInt(this.value), table.parent().find("search-result-page").length > 0);
+});
+
+
+
+
+
+function pagination(id, curPage, curPageSize, pageSizes) {
+
+    let footer = $('<div>').addClass("pagination-wrapper");
+
+    let sizeSelect = $('<div>').addClass("size-select");
+    sizeSelect.text("Rows per page ");
+    let dropdown = $('<select>').addClass("page-size-dropdown");
+    for(let size of pageSizes) {
+        dropdown.append($('<option>').text(size));
+    }
+    sizeSelect.append(dropdown);
+    footer.append(sizeSelect);
+
+    let pageStatus = $('<div>').addClass("page-status");
+    footer.append(pageStatus);
+
+    let pageSelectWrapper = $('<div>').addClass("page-select-wrapper");
+    let pageSelect = $('<div>').addClass("page-select");
+    pageSelectWrapper.append($('<div>').addClass("page-select-arrow-left").append($('<i class="fa fa-angle-left" aria-hidden="true"></i>')));
+    pageSelectWrapper.append($('<div>').addClass("page-select-arrow-left-full").append($('<i class="fa fa-angle-double-left" aria-hidden="true"></i>')));
+    pageSelect.append($('<span>').addClass("page-select-item").text("1"));
+    pageSelectWrapper.append(pageSelect);
+    pageSelectWrapper.append($('<div>').addClass("page-select-arrow-right-full").append($('<i class="fa fa-angle-double-right" aria-hidden="true"></i>')));
+    pageSelectWrapper.append($('<div>').addClass("page-select-arrow-right").append($('<i class="fa fa-angle-right" aria-hidden="true"></i>')));
+
+    footer.append(pageSelectWrapper);
+
+    $('#'+id).parent().append(footer);
+
+}
+
+function updatePage_help(id, curPage, curPageSize, clientSearch=false){
+    if(!clientSearch){
+        let searchContent = $('#'+id).siblings(".searchbar").eq(0).val();
+        updatePage(id, curPage, curPageSize, $('#'+id).find('.table-row').length, clientSearch, searchContent);
+    } else {
+        updatePage(id, curPage, curPageSize, $('#'+id).find('.table-row.search-result').length, clientSearch);
+    }
+}
+
+
+async function updatePage(id, curPage, curPageSize, total, clientSearch=false, params={}, searchContent=""){
+    
+    let serv = $('#'+id).data('side') === 'server';
+    
+    if(serv){
+        params = $('#'+id).data('params');
+        searchContent = $('#'+id).siblings(".function_bar").find(".searchbar").val();
+        try {
+            total = await serverSide(id, $('#'+id).data('url'), curPage, curPageSize, params, searchContent, window[id].sort_params);
+        } catch (e) {
+            console.log("aborted request");
+        }
+        try {
+            window[id].apply_styles();
+        } catch (e){
+            // don't need to
+        }
+    }
+
+    if(!clientSearch){
+        let start = curPage * curPageSize;
+        let end = Math.min(total, start + curPageSize-1);
+        $('#'+id).find('.table-row').each(function(){
+            $(this).toggle(($(this).attr("index") >= start && $(this).attr("index") <= end));
+        });
+
+        $('#'+id).data('currentPage', curPage);
+        $('#'+id).data('currentPageSize', curPageSize);
+
+
+        updatePageStatus($('#'+id).parent().find(".page-status").eq(0), curPage, curPageSize, total);
+        updatePageSelect($('#'+id).parent().find(".page-select").eq(0), curPage, curPageSize, total);
+
+    } else {
+        let start = curPage * curPageSize;
+        let end = Math.min(total, start + curPageSize-1);
+        $('#'+id).find('.table-row').hide();
+        $('#'+id).find('.table-row.search-result').each(function(i,value){
+            $(value).toggle((i >= start && i <= end));
+        });
+
+
+        $('#'+id).data('currentPage', curPage);
+        $('#'+id).data('currentPageSize', curPageSize);
+
+        updatePageStatus($('#'+id).parent().find(".page-status").eq(0), curPage, curPageSize, total);
+        updatePageSelect($('#'+id).parent().find(".page-select").eq(0), curPage, curPageSize, total, true);
+
+    }
+
+
+    post_styles(id, curPageSize);
+
+    $('#'+ id).removeClass("loading");
+
+}
+
+
+function updatePageStatus(elem, curPage, curPageSize, total){
+    
+    if(total == -1) {
+        elem.html("loading...");
+        return;
+    }
+    let start = curPage * curPageSize + 1;
+    let end = start + curPageSize - 1;
+    elem.html("Showing <b>" + start.toLocaleString() + " to " + Math.min(end,total).toLocaleString() + "</b> of " + total.toLocaleString() + " rows");
+
+}
+
+
+function updatePageSelect(elem, curPage, curPageSize, total, clientSearch) {
+    if(total === -1) {
+        elem.hide();
+        return;
+    } else {
+        elem.show();
+    }
+    elem.find('.table-ellipses').remove();
+    let last = elem.find('.page-select-item').last().index();
+    if(last * curPageSize < total){
+        for(let i = 1; (i+last)*curPageSize<total; i++){
+            elem.append($('<span>').addClass("page-select-item").text(i+last+1));
+        }
+    } else if(last * curPageSize > total) {
+        for(let j=last; j*curPageSize>total; j--){
+            elem.find('.page-select-item').last().remove();
+        }
+    }
+    if(clientSearch)
+        elem.find('.page-select-item').addClass("search-result-page");
+    else
+        elem.find('.page-select-item').removeClass("search-result-page");
+
+
+    elem.find('.page-select-item').removeClass("page-selected").eq(curPage).addClass("page-selected");
+    elem.parent().find(".page-select-arrow-left,.page-select-arrow-right,.page-select-arrow-left-full,.page-select-arrow-right-full").css({"opacity": 0, "pointer-events": "none"});
+    
+    let cur = elem.find(".page-selected").index();
+    last = elem.find('.page-select-item').last().index();
+    if(cur != 0) {
+        $(".page-select-arrow-left,.page-select-arrow-left-full").css({"opacity": 1, "pointer-events": "auto"});
+    }
+    if(cur != last) {
+        $(".page-select-arrow-right,.page-select-arrow-right-full").css({"opacity": 1, "pointer-events": "auto"});
+    }
+
+    if(elem.find('.page-select-item').length > 5) {
+        elem.children().hide();
+        // elem.find($(':nth-child(1)')).show();
+        // elem.find($(':nth-child(' + (last+1) + ')')).show();
+        for(let i=curPage;i<=curPage+2;i++){
+            elem.find($(':nth-child(' + i + ')')).show();
+        }
+        if(curPage == 0) {
+            elem.find($(':nth-child(3)')).show();
+        }
+        if(curPage == last) {
+            elem.find($(':nth-child(' + (last-2) + ')')).show();
+        }
+        // ellipses
+        if(curPage >= 2){
+            $("<span>").addClass("table-ellipses").text("...").insertAfter(elem.find('.page-select-item').eq(0));
+        }
+        if(curPage <= last-3){
+            $("<span>").addClass("table-ellipses").text("...").insertBefore(elem.find('.page-select-item').eq(last));
+        }
+    }
+
+}
+
+
+
+
+function post_styles(id, curPageSize) {
+
+    $('#'+ id + ' .table-row:visible:nth-child(' + curPageSize + ') .row-item:last-child').css('border-bottom-right-radius', '.5em');
+
+    if($('#'+id+" .row-item.drilldown-link .cell-text i").length === 0){
+        $('#'+id+" .row-item.drilldown-link .cell-text").append($('<i class="fas fa-level-down-alt"></i>'));
+    }
+
+}
\ No newline at end of file
diff --git a/app/assets/javascripts/transam_core/table-library/search.js b/app/assets/javascripts/transam_core/table-library/search.js
new file mode 100644
index 000000000..06f1067ac
--- /dev/null
+++ b/app/assets/javascripts/transam_core/table-library/search.js
@@ -0,0 +1,44 @@
+function addSearch(id) {
+    let searchbar = $('<input>').addClass("searchbar").attr('placeholder', "Search Table...");
+
+    $(searchbar).on("keyup", function(){
+        let value = $(this).val().toLowerCase();
+
+        if(value === "") {
+            removeSearch(id);
+            return;
+        }
+
+        $('#'+id +" .table-row").filter(function(){
+            $(this).removeClass("search-result");
+            if($(this).text().toLowerCase().indexOf(value) > -1){
+                $(this).addClass("search-result").show();
+            }
+        });
+        updatePage_help(id, 0, $('#'+id).data('currentPageSize'), true);
+    });
+    $('#'+id).parent().find(".function_bar").append(searchbar);
+}
+
+
+function addSearchServer(id) {
+    let searchbar = $('<input>').addClass("searchbar").attr('placeholder', "Search Table...");
+
+    $(searchbar).on("keyup", function(){
+        let value = $(this).val().toLowerCase();
+
+        if(value === "") {
+            $('#' + id + " .table-row").remove();
+            removeSearch(id);
+            return;
+        }
+        $('#' + id + " .table-row").remove();
+        updatePage(id, 0, $('#'+id).data('currentPageSize'),-1, false, $('#'+id).data('params'), value);
+    });
+    $('#'+id).parent().find(".function_bar").append(searchbar);
+}
+
+function removeSearch(id) {
+    $('#'+id +" .table-row").removeClass("search-result");
+    updatePage_help(id, 0, $('#'+id).data('currentPageSize'));
+}
diff --git a/app/assets/javascripts/transam_core/table-library/sorting.js b/app/assets/javascripts/transam_core/table-library/sorting.js
new file mode 100644
index 000000000..8d6d8b677
--- /dev/null
+++ b/app/assets/javascripts/transam_core/table-library/sorting.js
@@ -0,0 +1,101 @@
+$(document).ready(function(){
+    $(document).on("click",".library-table table[data-sort='client'] .header-item",(function(){
+      $(this).attr("order", $(this).attr("order") == "ascending" ? "descending" : "ascending");
+      $(this).parent().parent().parent().addClass('loading');
+      client_sort(this);
+    }
+      // function(){
+      //   var table = $(this).parents('.elbat').eq(0);
+      //   $(this).siblings().attr("order", "");
+      //   var rows = table.find('tr:gt(0)').toArray().sort(comparer($(this).index(), $(this).attr("order")));
+      //   $(this).attr("order", $(this).attr("order") == "ascending" ? "descending" : "ascending");
+      //   // update the sort_params object
+      //   console.log(window[table.attr('id')].sort_params);
+      //   updateSortPreferences(table.attr('id'), table.data('tableCode'), $(this).attr("code"), $(this).attr("order"));
+      //   for (var i = 0; i < rows.length; i++){
+      //       $(rows[i]).attr("index", i);
+      //       table.append(rows[i]);
+      //   }
+      //   if ($(table).find(".search-result").length > 0){
+      //       updatePage_help(table.attr('id'), table.data("currentPage"), table.data('currentPageSize'), true);
+      //   } else {
+      //       updatePage_help(table.attr('id'), table.data("currentPage"), table.data('currentPageSize'));
+      //   }
+      //   applyIcons(table.find('.header'));
+      // }
+      )
+    );
+    $(document).on("click",".library-table table[data-sort='server'] .header-item",(async function(){
+      
+      let table = $(this).parents('.elbat').eq(0);
+      let id = table.attr('id')
+      // toggle column
+      $(this).attr("order", $(this).attr("order") == "ascending" ? "descending" : "ascending");
+      $(this).siblings().attr("order", "");
+      let obj = {};
+      obj[$(this).attr("code")] = $(this).attr("order");
+      window[id].sort_params = [obj];
+      if ($(table).find(".search-result").length > 0){
+        updatePage(table.attr('id'), table.data("currentPage"), table.data('currentPageSize'), $('#'+id).find('.table-row.search-result').length, clientSearch, "", window[id].sort_params);
+      } else {
+        updatePage(table.attr('id'), table.data("currentPage"), table.data('currentPageSize'), $('#'+id).find('.table-row').length, false, "", window[id].sort_params);
+      }
+      applyIcons(table.find('.header'));
+    })
+  );
+});
+
+async function client_sort(elem){
+  var table = $(elem).parents('.elbat').eq(0);
+  $(elem).siblings().attr("order", "");
+  var rows = table.find('tr:gt(0)').toArray().sort(comparer($(elem).index(), $(elem).attr("order")));
+  // update the sort_params object
+  // console.log(window[table.attr('id')].sort_params);
+  await updateSortPreferences(table.attr('id'), table.data('tableCode'), $(elem).attr("code"), $(elem).attr("order"));
+  for (var i = 0; i < rows.length; i++){
+      $(rows[i]).attr("index", i);
+      table.append(rows[i]);
+  }
+  if ($(table).find(".search-result").length > 0){
+      updatePage_help(table.attr('id'), table.data("currentPage"), table.data('currentPageSize'), true);
+  } else {
+      updatePage_help(table.attr('id'), table.data("currentPage"), table.data('currentPageSize'));
+  }
+  applyIcons(table.find('.header'));
+  table.removeClass("loading");
+}
+
+const comparer = (idx, order) => (a, b) => ((v1, v2) => (order == "ascending") ?
+                    v1 !== '' && v2 !== '' && !isNaN(v1) && !isNaN(v2) ? v1 - v2 : v1.toString().localeCompare(v2):
+                    v1 !== '' && v2 !== '' && !isNaN(v1) && !isNaN(v2) ? v2 - v1 : v2.toString().localeCompare(v1))
+                    (getCellValue(a, idx), getCellValue(b, idx));
+
+
+const getCellValue = (row, index) => { 
+    let td = $(row).children('td').eq(index);
+    let date = new Date(td.text());
+    if($(td).attr("class").includes("checkmark-column")) { return $(td).children().eq(0).children().eq(0).css("visibility")=="hidden"; } // needs a lot of work but gets the job done
+    else if(td.text().includes('$')){ return Number(td.text().replace(/[^\d.]/g, '')); }
+    else if(td.text().includes('%')){ return Number(td.text().replace(/[^\d.]/g, '')); }
+    else if(td.text().includes('-')){ return td.text(); }
+    else if(date && date.toString() !== "Invalid Date"){ return date.getTime(); }
+    return td.text(); 
+}
+
+
+async function updateSortPreferences(id, table_code, column, order) {
+  // for(let col in window[id].sort_params){
+  //   if(col[column]) col[column] = order;
+  //   else window[id].sort_params.push({}[column]=order);
+  // }
+  let obj = {};
+  obj[column] = order;
+  window[id].sort_params = [obj];
+  $.ajax({
+    method: "PUT",
+    contentType: "application/json; charset=utf-8",
+    data:JSON.stringify({'table_preferences':{'table_code': table_code,'sort': window[id].sort_params}}), //[{org_name:"ascending"}]
+    url: "/users/table_preferences",
+    dataType: "json"
+  });
+}
diff --git a/app/assets/javascripts/transam_core/table-library/tabs.js b/app/assets/javascripts/transam_core/table-library/tabs.js
new file mode 100644
index 000000000..a53f8174e
--- /dev/null
+++ b/app/assets/javascripts/transam_core/table-library/tabs.js
@@ -0,0 +1,15 @@
+$(document).on("click", ".tab", function(){
+  $(this).siblings().removeClass("active");
+  $(this).addClass("active");
+  let tab_content = $(".elbat[data-table-code='" + $(this).attr("code") + "']").closest('.tab_content').addClass("active");
+  if($(".elbat[data-table-code='" + $(this).attr("code") + "']").length > 1){
+    // multiple tables with same code
+    try {
+      tab_content = $('#'+$(this).attr("table_id")).closest('.tab_content').addClass("active");
+    } catch (e) {
+      console.error("Error in generating tabbed tables: ", e);
+    }
+  }
+  tab_content.siblings(".active").hide();
+  tab_content.show();
+});
\ No newline at end of file
diff --git a/app/assets/stylesheets/transam_core/flyout.css b/app/assets/stylesheets/transam_core/flyout.css
new file mode 100644
index 000000000..02563a103
--- /dev/null
+++ b/app/assets/stylesheets/transam_core/flyout.css
@@ -0,0 +1,158 @@
+
+html {
+    max-width: 100%;
+    overflow-x: hidden;
+}
+
+.flyout-checkbox {
+    opacity: 0;
+    display:none;
+    /* position: absolute; */
+    /* left: 50vw; */
+}
+.flyout-label {
+    cursor: pointer;
+    border-radius: 5px;
+    color: #fff;
+    background-color: #17406E;
+    border-color: #133459;
+    margin-left: 10px;
+}
+.flyout-label:before {
+    content: "\f067";
+    display: inline-block;
+    font: normal normal normal 14px/1 FontAwesome;
+    font-size: inherit;
+    text-rendering: auto;
+    -webkit-font-smoothing: antialiased;
+    width: 1.28571429em;
+    text-align: center;
+}
+
+.flyout-content-right {
+    position: absolute;
+    left: 110%;
+    transition: left 0.5s ease;
+    background: white;
+    z-index: 999;
+}
+
+.flyout-content-right-stretch {
+    position: absolute;
+    left: 110vw;
+    transition: left 0.5s ease;
+    background: white;
+    z-index: 999;
+}
+
+.flyout-content-left {
+    position: absolute;
+    left: -100vw;
+    transition: left 0.5s ease;
+    background: white;
+    z-index: 999;
+}
+
+.flyout-panel {
+    height: fit-content;
+    width: 33vw;
+    border: 1px solid gray;
+    border-radius: 5px;
+    box-shadow: -5px 0px 5px 0px #BFBFBF
+
+}
+.flyout-panel header {
+    height: 40px;
+    background: #f5f5f5;
+    border-top-left-radius:5px;
+    border-top-right-radius:5px;
+    border-bottom: 1px solid gray;
+}
+/*.flyout-panel header span {*/
+    /*padding:10px;*/
+/*}*/
+
+.flyout-panel header label {
+    color: #17406e;
+    background: #f5f5f5;
+    border-top-left-radius:5px;
+    border-top-right-radius:5px;
+    border-bottom-left-radius:0px;
+    border-bottom-right-radius:0px;
+    width: 100%;
+    margin-left: 0px;
+}
+
+.flyout-panel header label:before {
+    display: none;
+}
+
+.flyout-content-right-stretch .flyout-panel {
+    width: 40vw;
+}
+
+.flyout-content-right  header:after, .flyout-content-left header:after {
+    content: '\00d7';
+    opacity: 0.5;
+    position: absolute;
+    right: 2%;
+    pointer-events: none;
+}
+.flyout-content-right-stretch  header:after, .flyout-content-left header:after {
+    content: '\00d7';
+    opacity: 0.5;
+    position: absolute;
+    right: 2%;
+    pointer-events: none;
+}
+
+.flyout-content-right header:hover:after, .flyout-content-left header:hover:after {
+    opacity: 1;
+}
+.flyout-content-right-stretch header:hover:after, .flyout-content-left header:hover:after {
+    opacity: 1;
+}
+
+.flyout-panel p{
+    margin:20px;
+}
+
+.flyout-checkbox:checked ~ .flyout-content-right {
+    left: -25vw;
+    display: block;
+}
+
+.flyout-checkbox:checked ~ .flyout-content-right-stretch {
+    left: 33vw;
+    display: block;
+}
+
+.flyout-checkbox:checked ~ .flyout-content-left {
+    left: 0vw;
+    display: block;
+}
+
+
+.bootstrap-table, .fixed-table-container, .fixed-table-body {
+    width: 100%;
+    transition: margin 0.5s ease;
+}
+
+.extend-right {
+    padding-right: 33%;
+    width: 133%;
+}
+
+.extend-left {
+    width: 67vw;
+    margin-left: 33vw;
+}
+
+.flyout-body {
+    padding: 40px 20px;
+    margin-left: 25%;
+}
+
+.closeFlyout {
+
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/transam_core/table-library/styles.css b/app/assets/stylesheets/transam_core/table-library/styles.css
new file mode 100644
index 000000000..7380c16df
--- /dev/null
+++ b/app/assets/stylesheets/transam_core/table-library/styles.css
@@ -0,0 +1,757 @@
+@import url("https://fonts.googleapis.com/css?family=Source+Code+Pro:400,600|Source+Sans+Pro:400,400i,600,600i,700&display=swap&subset=latin-ext");
+
+:root {
+    --white: #fff;
+
+    --blue-base: #18406E; /*// replaces #18406E and close matches*/
+    --blue-dark: #0E2744;
+    --blue-dark-desaturated: #3E5269;
+    --blue-medium: #3762A1;
+    --blue-light: #5B8EDC;
+    --blue-lighter: #C3DBFF;
+
+    /*// grays*/
+    --gray-base: #7F849B;
+
+    --gray-darker: #0E1824;
+    --gray-dark: #474C5E;
+    --gray-medium: #BBBFCE;
+    --gray-light: #E8EAF2;
+    --gray-lighter: #F6F8FF;
+
+    --gray-medium-dark: #9DA1B5;
+    --gray-medium-light: #CDD0DC;
+
+    --black: var(--gray-darker); /*// replaces #000000*/
+
+    /*// secondary colors*/
+    --turquoise: #56C6DE;
+    --gold: #E3A62E;
+    --red: #E44B54;
+    --green: #0ABF94;
+
+    --turquoise-light: #BCEFFF;
+    --turquoise-dark: #039CCD;
+    --gold-light: #FFF1D6;
+    --red-light: #FFCFBF;
+    --green-light: #DBF3DD;
+}
+
+.library-table {
+    background-color: var(--gray-light);
+    padding: 20px;
+    font-family: 'Source Sans Pro', sans-serif;
+    height: 100%;
+    -webkit-transition: max-height .25s ease-in-out;
+    -moz-transition: max-height .25s ease-in-out;
+    -o-transition: max-height .25s ease-in-out;
+    transition: max-height .25s ease-in-out;
+    overflow: hidden;
+}
+
+.elbat {
+    background-color: var(--white);
+    margin: 12px 0px;
+    box-shadow: 0 0 0 1px var(--gray-medium-light);
+    -webkit-border-radius: .5em;
+    -moz-border-radius: .5em;
+    border-radius: .5em;
+    width: 100%;
+    height: 100%;
+    table-layout: fixed;
+}
+
+.col-item {
+}
+
+.header-checkbox, .cell-checkbox {
+    border-left: 1px solid var(--gray-medium-light);
+    background-color: var(--white);
+    padding: .375rem .25rem;
+    text-align: center;
+    position: relative;
+}
+
+.header-checkbox {
+    padding: 0 !important;
+}
+
+.cell-checkbox {
+    border-top: 1px solid var(--gray-medium-light);
+    background-clip: padding-box; /* Firefox Bug */
+}
+
+.fa-stack {
+    font-size: 1.25em; /* 16px */
+    position: absolute;
+    z-index: 1;
+    left: 50%;
+    transform: translateX(-50%);
+    top: 0;
+    color: var(--white);
+    height: 0.75em !important;
+    line-height: 1em !important;
+    /* note for some reason sass wouldn't compile the second line correctly without interpolating the color variable, i assume because it's not a normal css property.
+    // more info on styling duotone icons here https://fontawesome.com/how-to-use/on-the-web/styling/duotone-icons */
+    --fa-secondary-opacity: 1.0;
+    --fa-secondary-color: var(--gray-medium-light);
+
+}
+
+.fa-stack:hover {
+    --fa-secondary-color: var(--gray-medium);
+
+}
+
+.fa-stack .fa-check-square {
+    opacity: 0;
+    color: var(--turquoise);
+}
+.fa-stack .fa-check-square input[type='checkbox'] {
+    opacity: 0;
+}
+
+.cell-checkbox input[type='checkbox']:checked + .fa-stack .fa-check-square, .header-checkbox input[type='checkbox']:checked + .fa-stack .fa-check-square {
+    opacity: 1;
+}
+
+.row-checked td {
+    border-left: none;
+    box-shadow: 0px 0px 10px 5px var(--gray-light);
+    clip-path: inset(0px 0px -10px 0px);
+    -webkit-clip-path: inset(0px 0px -10px 0px);
+    z-index: 999;
+}
+
+.cell-checkbox input, .header-checkbox input {
+    opacity: 0;
+    display: none;
+}
+
+.cell-checkbox label {
+    display: block;
+    max-width: unset;
+    font-weight: 700;
+    height: unset;
+}
+
+.loading::after {
+    content: 'loading...';
+    width: 100%;
+    margin: auto;
+    display: inline-block;
+    position: absolute;
+    text-align: center;
+}
+
+.header-item {
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: 600;
+    text-transform: uppercase;
+    line-height: 2.1;
+    vertical-align: bottom;
+    background-color: var(--gray-lighter);
+    border-left: solid var(--gray-medium-light) 1px;
+    max-width: 16em;
+    vertical-align: bottom;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    position: relative;
+    background-clip: padding-box; /* Firefox Bug */
+}
+
+.header-item:hover {
+    overflow: visible;
+}
+
+.header-text {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+}
+
+.header-content {
+    font-size: .865em; /* 12px */
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    width: -webkit-fill-available;
+    width: -moz-available;
+    min-width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    -o-text-overflow: ellipsis;
+    text-overflow: ellipsis;
+    -webkit-box-sizing: border-box;
+    padding: .375em;
+    display: flex;
+    justify-content: space-between;
+}
+
+.header-content:hover {
+    z-index: 100;
+    width: auto;
+    /*border-right: 1px solid ;*/
+    box-shadow: 0 0 0 1px var(--gray-medium-light);
+    background: -webkit-gradient(linear, left top, right top, from(var(--gray-lighter)), to(var(--white)));
+    background: -webkit-linear-gradient(left, var(--gray-lighter) 0%, var(--white) 100%);
+    background: -o-linear-gradient(left, var(--gray-lighter) 0%, var(--white) 100%);
+    background: linear-gradient(90deg, var(--gray-lighter) 0%, var(--white) 100%);
+    overflow: visible;
+}
+
+.header-item:first-child {
+    border-left: none;
+    border-top-left-radius: .5em;
+}
+
+.header-item:last-child {
+    border-top-right-radius: .5em;
+}
+
+.header-icons {
+    float: right;
+    display: flex;
+    white-space: nowrap;
+}
+
+.header-icons:hover, .icon:hover {
+    color: var(--blue-base);
+}
+
+.icon {
+    font-size: 1em;
+    color: var(--gray-medium-dark);
+    padding-left: 6px;
+    -webkit-transition: color .25s ease-in-out;
+    -o-transition: color .25s ease-in-out;
+    transition: color .25s ease-in-out;
+}
+
+/* .icon:not(.sort) {
+    display: none; 
+}
+.icon.sort .sorted {
+    display: none; 
+} */
+.icon .fad {
+    --fa-secondary-opacity: 1.0;
+    --fa-secondary-color: #56C6DE; 
+}
+.icon.filtered {
+    color: #56C6DE; 
+}
+.icon:hover {
+    color: #18406E; 
+}
+.icon:hover .fad {
+    --fa-secondary-opacity: .5;
+    --fa-secondary-color: currentColor; 
+}
+.icon .unsorted {
+    display: none; 
+}
+.icon .sorted {
+    display: inline-block; 
+}
+.sorted-asc .desc {
+    display: none; 
+}
+.sorted-desc .asc {
+    display: none; 
+}
+.filtered .icon.filtered {
+    display: inline-block; 
+}
+.sql-text {
+    word-break: break-all;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+.table-row:hover .row-item .cell-text,
+.table-row:hover .cell-checkbox,
+.table-row:hover .cell-checkbox input,
+.table-row:hover .row-item {
+    background-color: var(--gray-light);
+}
+
+.row-item {
+    border-top: 1px solid var(--gray-medium-light);
+    border-left: 1px solid var(--gray-medium-light);
+    padding: 1.375rem 1.5rem;
+    text-align: left;
+    letter-spacing: .03em;
+    white-space: nowrap;
+    background-color: var(--white);
+    -webkit-transition: background-color .25s ease-in-out;
+    -moz-transition: background-color .25s ease-in-out;
+    -o-transition: background-color .25s ease-in-out;
+    transition: background-color .25s ease-in-out;
+    max-width: 16em;
+    font-size: .925em;
+    vertical-align: top;
+    overflow: hidden;
+    position: relative;
+    background-clip: padding-box; /* Firefox Bug */
+}
+
+.row-item:hover {
+    overflow: visible;
+}
+
+.cell-text {
+    padding: .375rem .5rem;
+    width: -webkit-fill-available;
+    width: -moz-available;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    min-width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    -o-text-overflow: ellipsis;
+    text-overflow: ellipsis;
+    -webkit-box-sizing: border-box;
+    background: #fff;
+/* box-sizing: border-box; */
+
+}
+
+.cell-text > * {
+    overflow: hidden;
+    -o-text-overflow: ellipsis;
+    text-overflow: ellipsis;
+}
+
+.cell-text:hover {
+    z-index: 100;
+    width: auto;
+    height: fit-content;
+    min-height: 2.4em;
+    /*border-right: 1px solid ;*/
+    box-shadow: 0 0 0 1px var(--gray-medium-light);
+    background: -webkit-gradient(linear, left top, right top, from(var(--gray-light)), to(var(--gray-lighter)));
+    background: -webkit-linear-gradient(left, var(--gray-light) 0%, var(--gray-lighter) 100%);
+    background: -o-linear-gradient(left, var(--gray-light) 0%, var(--gray-lighter) 100%);
+    background: linear-gradient(90deg, var(--gray-light) 0%, var(--gray-lighter) 100%);
+    overflow: visible;
+    white-space: break-spaces;
+}
+
+
+.cell-text > .custom-drilldown-content:hover {
+    z-index: 100;
+    width: auto;
+    height: unset;
+    min-height: unset;
+    /*border-right: 1px solid ;*/
+    box-shadow: 0 0 0 1px var(--gray-medium-light);
+    background: -webkit-gradient(linear, left top, right top, from(var(--gray-light)), to(var(--gray-lighter)));
+    background: -webkit-linear-gradient(left, var(--gray-light) 0%, var(--gray-lighter) 100%);
+    background: -o-linear-gradient(left, var(--gray-light) 0%, var(--gray-lighter) 100%);
+    background: linear-gradient(90deg, var(--gray-light) 0%, var(--gray-lighter) 100%);
+    overflow: unset;
+    white-space: unset;
+}
+
+
+.table-row .cell-checkbox:first-child {
+    border-left: none;
+}
+
+.table-row:last-child .cell-checkbox:first-child {
+    border-bottom-left-radius: .5em;
+}
+
+.table-row:last-child td:last-child {
+    border-bottom-right-radius: .5em;
+}
+
+.table-row {
+    display:none;
+}
+
+.page-select-wrapper {
+    display: flex;
+}
+
+.page-select {
+    display: flex;
+    justify-content: center;
+    min-width: 11em;
+}
+
+.page-select-arrow-left, .page-select-arrow-right, .page-select-arrow-left-full, .page-select-arrow-right-full {
+    display:flex;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    margin: .5em .25em;
+    padding: .25em .5em;
+    opacity: 1;
+    pointer-events: auto;
+    -webkit-transition: opacity .25s ease-in-out;
+    -moz-transition: opacity .25s ease-in-out;
+    -o-transition: opacity .25s ease-in-out;
+    transition: opacity .25s ease-in-out;
+    /* not selectable */
+    -webkit-user-select: none; 
+    -moz-user-select: none; 
+    -ms-user-select: none; 
+    user-select: none; 
+}
+
+.page-select-item {
+    padding: .25em .5em;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    margin: .25em;
+    -webkit-transition: background .1s ease-in-out;
+    -moz-transition: background .1s ease-in-out;
+    -o-transition: background .1s ease-in-out;
+    transition: background .1s ease-in-out;
+}
+
+/*.page-select-item:nth-child(1)::after {*/
+    /*content: '...';*/
+    /*padding: .5em .25em;*/
+/*}*/
+/*.page-select-item:last-child::before {*/
+    /*content: '...';*/
+    /*padding: .5em .25em;*/
+/*}*/
+
+
+
+
+.page-select-item:hover, .page-select-arrow-left:hover, .page-select-arrow-right:hover, .page-select-arrow-left-full:hover, .page-select-arrow-right-full:hover {
+    background: #FFFFFF;
+}
+
+.page-selected {
+    background: #FFFFFF;
+    font-weight: bold;
+}
+
+.table-ellipses {
+    padding: .5em .25em;
+}
+
+.pagination-wrapper {
+    display: flex;
+    justify-content: space-between;
+}
+
+.size-select, .page-status, .page-selected {
+    float: left;
+}
+
+.page-size-dropdown {
+    width: 1.5em;
+    color: var(--white);
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance:none;
+    border: none;
+    box-shadow: none;
+    border-radius: 0.25em;
+    background: #7f849b;
+    -ms-text-align-last: center;
+    text-align-last: center;
+    margin-left: 0.375em;
+}
+
+
+.tabs_wrapper {
+    display: flex;
+    flex-direction: column;
+    background: var(--gray-light);
+}
+
+.tabs {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    width: fit-content;
+    max-width: 75%;
+    border-radius: 5px;
+    background: var(--gray-medium-light);
+    margin: 10px 20px;
+}
+
+.tab {
+    color: var(--gray-dark);
+    float: left;
+    padding: 5px;
+    margin: 5px;
+    border-radius: 5px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.tab.active {
+    background: var(--white);
+    color: var(--blue-base);
+    font-weight: bold;
+}
+
+.tab.active:hover {
+    overflow: visible;
+}
+
+.tab:not(.active):hover {
+    color: var(--white);
+    background: var(--blue-base);
+    overflow: visible;
+}
+
+.tab_content {
+    display: none;
+}
+
+.tab_content.active {
+    display: block;
+}
+
+.function_bar {
+    float: right;
+}
+
+.searchbar {
+    float: right;
+}
+
+.export {
+    float: right;
+}
+
+.function_button {
+    color: var(--white);
+    padding: 5px 10px;
+    margin-left: .5em;
+    margin-bottom: .5em;
+    border-radius: 5px;
+    background-color: var(--blue-light);
+    min-width: 2.5rem;
+    border: 1px solid;
+    -webkit-box-shadow: 1px 1px 0.25em rgba(14, 24, 36, 0.25);
+    box-shadow: 1px 1px 0.25em rgba(14, 24, 36, 0.25);
+    position: relative;
+    -webkit-transition: .25s ease-in-out;
+    -o-transition: .25s ease-in-out;
+    transition: .25s ease-in-out;
+}
+
+.function_button:hover, .open .function_button {
+    background-color: #56C6DE;
+}
+
+.function_button:before {
+    content: '';
+    position: absolute;
+    top: 2px;
+    left: 2px;
+    right: 2px;
+    bottom: 2px;
+    z-index: 1;
+    border-radius: 2px;
+    background-color: #fff;
+    background: -webkit-gradient(linear, left bottom, left top, from(#5B8EDC), to(rgba(255, 255, 255, 0.5)));
+    background: -webkit-linear-gradient(bottom, #5B8EDC 0%, rgba(255, 255, 255, 0.5) 100%);
+    background: -o-linear-gradient(bottom, #5B8EDC 0%, rgba(255, 255, 255, 0.5) 100%);
+    background: linear-gradient(0deg, #5B8EDC 0%, rgba(255, 255, 255, 0.5) 100%);
+}
+
+.function_button:hover:before, .open .function_button:before {
+    background: -webkit-gradient(linear, left bottom, left top, from(rgba(255, 255, 255, 0.5)), to(#56C6DE));
+    background: -webkit-linear-gradient(bottom, rgba(255, 255, 255, 0.5) 0%, #56C6DE 100%);
+    background: -o-linear-gradient(bottom, rgba(255, 255, 255, 0.5) 0%, #56C6DE 100%);
+    background: linear-gradient(0deg, rgba(255, 255, 255, 0.5) 0%, #56C6DE 100%);
+}
+
+.function_button:after {
+    content: '';
+    position: absolute;
+    top: 3px;
+    left: 3px;
+    right: 3px;
+    bottom: 3px;
+    z-index: 2;
+    border-radius: 1px;
+    background-color: #5B8EDC;
+    background: -webkit-gradient(linear, left bottom, left top, from(rgba(55, 98, 161, 0.6)), to(#5B8EDC));
+    background: -webkit-linear-gradient(bottom, rgba(55, 98, 161, 0.6) 0%, #5B8EDC 100%);
+    background: -o-linear-gradient(bottom, rgba(55, 98, 161, 0.6) 0%, #5B8EDC 100%);
+    background: linear-gradient(0deg, rgba(55, 98, 161, 0.6) 0%, #5B8EDC 100%);
+}
+
+.function_button:hover:after, .open .function_button::after {
+    background-color: #039CCD;
+    background-color: rgba(86, 198, 222, 0.6);
+    background: -webkit-gradient(linear, left bottom, left top, from(rgba(86, 198, 222, 0.6)), to(#039CCD));
+    background: -webkit-linear-gradient(bottom, rgba(86, 198, 222, 0.6) 0%, #039CCD 100%);
+    background: -o-linear-gradient(bottom, rgba(86, 198, 222, 0.6) 0%, #039CCD 100%);
+    background: linear-gradient(0deg, rgba(86, 198, 222, 0.6) 0%, #039CCD 100%);
+}
+
+.function_button i {
+    position: relative;
+    z-index: 10;
+}
+
+.export_options {
+    display: none;
+    background-color: #18406E;
+    border-radius: 6px;
+    color: #fff;
+    margin-top: 1rem;
+    padding: .5rem 0;
+    -webkit-box-shadow: -1px 1px 0.5rem rgba(14, 24, 36, 0.4);
+    box-shadow: -1px 1px 0.5rem rgba(14, 24, 36, 0.4);
+    position: absolute;
+    right: 2em;
+    min-width: 10rem;
+    z-index: 1001;
+}
+
+.export_options::before {
+    content: '';
+    width: 0;
+    height: 0;
+    border: .5rem solid transparent;
+    border-bottom-color: #18406E;
+    display: inline-block;
+    position: absolute;
+    top: -10px;
+    right: 0.75rem;
+}
+
+.export_label {
+    font-weight: bold;
+}
+
+.export_option, .export_label {
+    color: var(--white);
+    z-index: 11;
+    display: block;
+    width: 100%;
+    text-align: left;
+    color: currentColor;
+    padding: .5rem .75rem;
+    font-size: 1.1em;
+    text-decoration: none;
+}
+
+.export_option:hover {
+    background-color: var(--blue-light);
+    text-decoration: none;
+    color: var(--white);
+}
+
+
+.export_option i {
+    margin-right: .75rem;
+}
+
+.export.open .export_options {
+    display: block;
+}
+
+.selected_rows_checkbox_wrapper {
+    padding: .5rem .75rem;
+}
+
+.selected_rows_checkbox_wrapper input{
+    margin: 0px;
+
+}
+
+.selected_rows_checkbox_label {
+    margin: 0px .75rem;
+    font-weight: inherit;
+}
+
+
+
+
+
+
+
+/* THEMES */
+
+.drilldown-link {
+    color: var(--blue-light);
+}
+
+.drilldown-link .cell-text i {
+    overflow: visible;
+}
+
+.drilldown-link .cell-text i::before {
+    transition: top .125s ease-in-out;
+    font-size: .8em;
+    top: 0em;
+    position: relative;
+    padding-left: .5em;
+}
+
+.drilldown-link:hover{
+    color: var(--turquoise-dark);
+}
+
+.drilldown-link .cell-text a:hover ~ i::before {
+    top: .25em;
+}
+
+.right-align .cell-text{
+    text-align: right;
+}
+
+.action-column .cell-text{
+    white-space: nowrap;
+     text-align: center;
+}
+
+
+.checkmark-column .cell-text{
+    text-align: center;
+}
+
+
+/*font-awesome checkmark cells had delayed background animations on hover */
+.checkmark-column {
+    -webkit-transition: none !important;
+    -o-transition: none !important;
+    -moz-transition: none !important;
+    transition: none !important;
+}
+
+.actions, .custom-drilldown-content {
+    display: none;
+}
+
+.action-column .actions, .cell-text .custom-drilldown-content {
+    display: inline-flex;
+}
+
+
diff --git a/app/controllers/activity_logs_controller.rb b/app/controllers/activity_logs_controller.rb
index aa90a2d43..ab9ef866f 100644
--- a/app/controllers/activity_logs_controller.rb
+++ b/app/controllers/activity_logs_controller.rb
@@ -13,7 +13,7 @@ def index
     add_breadcrumb "Activity Log"
 
     # get the policies for this agency
-    @activities = ActivityLog.where(organization: @organization_list).order('activity_time')
+    @activities = ActivityLog.where(organization: @organization_list).order(activity_time: :desc).limit(1000)
 
     # cache the set of object keys in case we need them later
     #cache_list(@activities, INDEX_KEY_LIST_VAR)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3f7a6fee0..08209bfb3 100755
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -135,24 +135,103 @@ def index
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json {
-        render :json => {
-          :total => @users.count,
-          :rows => @users.limit(params[:limit]).offset(params[:offset]).collect{ |u|
-            u.as_json.merge!({
-                 organization_short_name: u.organization.short_name,
-                 organization_name: u.organization.name,
-                 role_name: u.roles.roles.last&.label,
-                 privilege_names: u.roles.privileges.collect{|x| x.label}.join(', '),
-                 all_orgs: u.organizations.map{ |o| o.to_s }.join(', ')
-            }) if @roles.nil? || @roles.include?(u.roles.roles.last.name)
-          }.compact
-        }
-      }
+      # format.json {
+      #   render :json => {
+      #     :total => @users.count,
+      #     :rows => @users.limit(params[:limit]).offset(params[:offset]).collect{ |u|
+      #       u.as_json.merge!({
+      #            organization_short_name: u.organization.short_name,
+      #            organization_name: u.organization.name,
+      #            role_name: !@role.blank? && (@role.kind_of?(Array) ? !Role.find_by(name:@role.first).privilege : !Role.find_by(name: @role).privilege) ? (@role.kind_of?(Array) ? u.roles.roles.where(name: @role).last.label : u.roles.roles.find_by(name: @role).label) : u.roles.roles.last.label,
+      #            privilege_names: u.roles.privileges.collect{|x| x.label}.join(', '),
+      #            all_orgs: u.organizations.map{ |o| o.to_s }.join(', ')
+      #       })
+      #     }
+      #   }
+      # }
 
     end
   end
 
+  #-----------------------------------------------------------------------------
+  # Show the list of current sessions. Only available for admin users
+  # TODO: MOST of this will be moved to a shareable module
+  #-----------------------------------------------------------------------------
+  def table
+
+    ### Get the default set of users ###
+    users = join_builder
+
+    ### Pluck out the Params ###
+    page = (table_params[:page] || 0).to_i
+    page_size = (table_params[:page_size] || users.count).to_i
+    search = (table_params[:search])
+    offset = page*page_size
+    sort_column = params[:sort_column]
+    sort_order = params[:sort_order]
+
+    ### Update SORT Preferences ###
+    if sort_column
+      current_user.update_table_prefs(:users, sort_column, sort_order)
+    end
+
+    ### Search ###
+    if search
+      searchable_columns = [:first_name, :last_name, :phone, :phone_ext, :email, :title] 
+      search_string = "%#{search}%"
+      query = query_builder(searchable_columns, search_string)
+      users = users.where(query)
+      ####### Get users who match search on role
+      ##users_on_role = (role_query search_string).pluck(:id)
+      ######## Search on every column (except role)
+      ##all_user_table = User.joins(:organization).joins(:roles).where(query).pluck(:id)
+      ######### Take the union of the above searches
+      ##users = User.where(id: [users_on_role + all_user_table].uniq)
+    end
+
+    ### SORT ###
+    users = users.order(current_user.table_sort_string :users)
+
+    ### Rowify Everything ###      
+    user_table = users.offset(offset).limit(page_size).map{ |u| u.rowify }
+    render status: 200, json: {count: users.count, rows: user_table}
+  end
+
+  def join_builder
+    User.unscoped.joins(:organization)
+      #.joins(:roles)
+      #.joins('left join max_user_roles_and_labels on users.id=max_user_roles_and_labels.user_id')
+  end
+
+  def query_builder searchable_columns, search_string
+    user_query_builder(searchable_columns, search_string)
+      .or(org_query search_string)
+      #.or(privilege_query search_string)
+      #.or(role_query search_string)
+  end
+
+  def user_query_builder atts, search_string
+    if atts.count <= 1
+      return User.joins(:organziation).arel_table[atts.pop].matches(search_string)
+    else
+      return User.joins(:organization).arel_table[atts.pop].matches(search_string).or(query_builder(atts, search_string))
+    end
+  end
+
+  def role_query search_string
+    q =  "max_user_roles_and_labels.role_label like '#{search_string}'"
+    User.joins('left join max_user_roles_and_labels on users.id=max_user_roles_and_labels.user_id').where(q)
+  end
+
+  def org_query search_string 
+    Organization.arel_table[:name].matches(search_string).or(Organization.arel_table[:short_name].matches(search_string))
+  end
+
+  def privilege_query search_string 
+    Role.where(privilege: true).arel_table[:label].matches(search_string)
+  end
+
+
   #-----------------------------------------------------------------------------
   # Show the list of current sessions. Only available for admin users
   #-----------------------------------------------------------------------------
@@ -160,6 +239,7 @@ def sessions
 
     key = "000000:#{TransamController::ACTIVE_SESSION_LIST_CACHE_VAR}"
     @sessions =  Rails.cache.fetch(key)
+    @sessions.delete_if { |key, value| value[:expire_time] < Time.now }
     @sessions ||= {}
 
   end
@@ -412,6 +492,23 @@ def popup
     @user = User.find_by_object_key(params[:id])
   end
 
+  def table_preferences
+    table_code = params[:table_code] || nil
+    render status: 200, json: current_user.table_preferences(table_code)
+  end 
+
+  #TODO Update to new Format
+  def update_table_preferences
+    table_code = table_preference_params[:table_code]
+    sort_params = table_preference_params[:sort]
+    table_prefs = eval(current_user.table_preferences || "{}")
+    sort_params = {sort: sort_params}
+    table_prefs[table_code.to_sym] = sort_params
+    current_user.update(table_prefs: table_prefs)
+
+    render status: 200, json: current_user.table_preferences(table_code)
+  end 
+
   #------------------------------------------------------------------------------
   # Protected Methods
   #------------------------------------------------------------------------------
@@ -444,6 +541,15 @@ def form_params
     params.require(:user).permit(user_allowable_params)
   end
 
+  def table_params
+    params.permit(:page, :page_size, :search, :sort_column, :sort_order)
+  end
+
+  def table_preference_params
+    request.parameters[:table_preferences]
+    #params.permit(:table_code, sort: [:column, :order])
+  end
+
   #-----------------------------------------------------------------------------
   # Callbacks to share common setup or constraints between actions.
   #-----------------------------------------------------------------------------
@@ -474,6 +580,8 @@ def set_user
     return
   end
 
+
+
   #-----------------------------------------------------------------------------
   def add_user_breadcrumb(page)
     if @user.id == current_user.id
diff --git a/app/helpers/transam_format_helper.rb b/app/helpers/transam_format_helper.rb
index e7e634348..7dba06fe4 100644
--- a/app/helpers/transam_format_helper.rb
+++ b/app/helpers/transam_format_helper.rb
@@ -2,7 +2,7 @@ module TransamFormatHelper
 
   # Include the fiscal year mixin
   include FiscalYear
-
+  include ActionView::Helpers::NumberHelper
 
   # Formats text as as HTML using simple_format
   def format_as_text(val, sanitize=false)
diff --git a/app/models/concerns/fiscal_year.rb b/app/models/concerns/fiscal_year.rb
index 6a667bb1a..e6a399b8f 100644
--- a/app/models/concerns/fiscal_year.rb
+++ b/app/models/concerns/fiscal_year.rb
@@ -135,7 +135,7 @@ def fiscal_year(year, klass = nil)
         next_yr = (yr + 1)
       end
       last = "%.2d" % next_yr
-      "FY #{first}-#{last}"
+      "#{first}-#{last}"
     end
   end
 
diff --git a/app/models/concerns/table_preferences.rb b/app/models/concerns/table_preferences.rb
new file mode 100644
index 000000000..b8fc888e8
--- /dev/null
+++ b/app/models/concerns/table_preferences.rb
@@ -0,0 +1,403 @@
+module TablePreferences
+
+  DEFAULT_TABLE_PREFERENCES = 
+    {
+      bus: { 
+          sort: [{org_name: :ascending}, {asset_id: :ascending}],
+          columns: [:asset_id, :org_name, :vin, :manufacturer, :model, :year, :type, :subtype, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      rail_car: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :vin, :manufacturer, :model, :year, :type, :subtype, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      ferry: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :vin, :manufacturer, :model, :year, :type, :subtype, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      other_passenger_vehicle: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :vin, :manufacturer, :model, :year, :type, :subtype, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      service_vehicle: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :vin, :manufacturer, :model, :year, :type, :subtype, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      capital_equipment: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :description, :manufacturer, :model, :year, :type, :subtype, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      admin_facility: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :facility_name, :year, :type, :subtype, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      maintenance_facility: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :facility_name, :year, :type, :subtype, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      passenger_facility: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :facility_name, :year, :type, :subtype, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      parking_facility: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :facility_name, :year, :type, :subtype, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      track: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :from_line, :from_segment, :to_line, :to_segment, :subtype, :description, :main_line,  :branch, :track, :segment_type, :location, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      guideway: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :from_line, :from_segment, :to_line, :to_segment, :subtype, :description, :main_line,  :branch, :number_of_tracks, :segment_type, :location, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      power_signal: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}],
+        columns: [:asset_id, :org_name, :from_line, :from_segment, :to_line, :to_segment, :subtype, :description, :main_line,  :branch, :segment_type, :location, :service_status, :last_life_cycle_action, :life_cycle_action_date]
+      },
+      groups: {
+        sort: [{name: :ascending}],
+      },
+      disposition: {
+        sort: [{org_name: :ascending}]
+      },
+      transfer: {
+        sort: [{org_name: :ascending}]
+      },
+      saved_queries: {
+        sort: [{name: :ascending}]
+      },
+      bulk_updates: {
+        sort: [{uploaded_at: :descending}]
+      },
+      projects: {
+        sort: [{fiscal_year: :ascending}, {org_name: :ascending},  {project_id: :ascending}]
+      },
+      project_phase: {
+        sort: [{fiscal_year: :ascending}, {org_name: :ascending},  {project_id: :ascending}]
+      },
+      programs: {
+        sort: [{name: :ascending}]
+      },
+      templates: {
+        sort: [{name: :ascending}]
+      },
+      buckets: {
+        sort: [{fiscal_year: :ascending}, {name: :ascending}, {owner: :ascending}]
+      },
+      grants: {
+        sort: [{owner: :ascending}, {year: :descending}]
+      },
+      bond_requests: {
+        sort: [{org_name: :ascending}, {created: :descending}]
+      },
+      import_export: {
+        sort: [{created_at: :descending}, {type: :ascending}]
+      },
+      my_funds: {
+        sort: [{fiscal_year: :ascending}, {name: :ascending}, {owner: :ascending}]
+      },
+      status: {sort: []},
+      audit: {
+        sort: [{org_name: :ascending}, {audit_type: :ascending}, {asset_id: :ascending}]
+      },
+      user_login_report: {sort: []},
+      issues_report: {sort: []},
+      performance_restrictions: {
+        sort: [{active_start: :descending}]
+      },
+      asset_condition_report: [],
+      asset_age_report: [],
+      asset_funding_source_report: [],
+      unconstrainted_capital_projects_report_summary: [],
+      unconstrained_capital_preojects_report_by_org: [],
+      needs_versus_funding_statewide_report: [],
+      ali_funding_report: [],
+      ali_funding_report_ali_specific_drilldown: [],
+      capital_plan_report: [],
+      bond_request_report: [],
+      quarterly_reports: {
+        sort: [{fy_q: :descending}, {operator: :ascending}]
+      },
+      opt5b_reports: {
+        sort: [{fy_q: :descending}, {operator: :ascending}]
+      },
+      ntd_revenue_vehicles: {
+        sort: [{org_name: :ascending}, {year_manufactured: :descending}]
+      },
+      ntd_service_vehicles: {
+        sort: [{org_name: :ascending}, {year_manufactured: :descending}]
+      },
+      ntd_manage_fleets: {
+        sort: [{org_name: :ascending}, {asset_id: :ascending}]
+      },
+      ntd_asset_reports: {
+        sort: [{org_name: :ascending}, {ntd_reporting_year: :descending}]
+      },
+      tam_service_life_summary_report_vehicles: [],
+      tam_service_life_summary_report_facilities: [],
+      tam_service_life_summary_report_track: [],
+      map_overlay_service: {
+        sort: [{name: :ascending}]
+      },
+      message_templates: {
+        sort: [{id: :ascending}]
+      },
+      message_history: {
+        sort: [{entry_date_and_time: :descending}]
+      },
+      audits: {
+        sort: [{name: :ascending}, {description: :ascending}, {last_run: :descending}]
+      },
+      org_names: {
+        sort: [{short_name: :ascending}]
+      },
+      users: {
+        sort: [{last_name: :ascending}, {organization: :ascending}]
+      },
+      activity_log: {
+        sort: [{date_time: :descending}]
+      },
+      notices: {
+        sort: [{visible: :ascending}, {display_until: :descending}]
+      },
+      online_users: {
+        sort: [{user: :ascending}]
+      }
+    }
+
+  # Get all table preferences, or preferences for a specific table
+  def table_preferences table_code=nil
+    if table_code
+      eval(table_prefs || "{}").try(:[], table_code.to_sym) || DEFAULT_TABLE_PREFERENCES[table_code.to_sym]
+    else
+      table_prefs
+    end
+  end
+
+  # Get column preferences for a specific table
+  def column_preferences table_code
+      preferences = table_preferences table_code
+      preferences.try(:[], :columns) || DEFAULT_TABLE_PREFERENCES[table_code.to_sym][:columns]
+  end
+
+  # Used to generate a SQL string for sorting on the preferred column
+  #TODO: Move to TableTools
+  def table_sort_string table_code
+    sorting = table_preferences(table_code)[:sort]
+    column = sorting.first 
+    key = column.keys.first 
+    order_string = (column[key] == :descending) ? "DESC" : "ASC"
+    return "#{SORT_COLUMN[table_code][key]} #{order_string}"
+  end
+
+  # Update a user's sort and preferred columns for a table 
+  def update_table_prefs table_code, sort_column, sort_order, columns_string 
+    # Get the user's current set of preferences for all tables.
+    table_prefs = eval(self.table_preferences || "{}")
+    
+    # Update the sort order
+    if sort_column
+      sort_params = {}
+      asc_desc = (sort_order.to_s.downcase == "descending") ? :descending : :ascending
+      sort_params[sort_column.to_sym] = asc_desc 
+      sort_params = [sort_params]
+      table_prefs[table_code.to_sym][:sort] = sort_params
+    end 
+
+    # Update the selected columns
+    if columns_string
+      columns = columns_string.split(',').map{ |x| x.downcase.strip.to_sym}
+      table_prefs[table_code.to_sym][:columns] = columns
+    end
+
+    self.update(table_prefs: table_prefs)
+  end
+
+  # This is done as a reset
+  def delete_table_prefs table_code 
+    table_prefs = eval(self.table_preferences || "{}")
+    table_prefs.delete(table_code.to_sym)
+    self.update(table_prefs: table_prefs)
+  end
+
+  private 
+
+  #TODO: Move to TableTools
+  # THis is a map between every column and the SQL string required to sort on that column
+  SORT_COLUMN = {
+    track: 
+      { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        description: 'description',
+        from_line: 'from_line',
+        to_line: 'to_line',
+        from_segment: 'from_segment',
+        to_segment: 'to_segment',
+        location: 'relative_location',
+        subtype: 'asset_subtypes.name',
+        main_line: 'infrastructure_divisions.name',
+        branch: 'infrastructure_subdivisions.name',
+        track: 'infrastructure_tracks.name',
+        location: 'relative_locations.name',
+        segment_type: 'infrastructure_segment_types.name'
+      },
+    guideway: 
+      { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        description: 'description',
+        from_line: 'from_line',
+        to_line: 'to_line',
+        from_segment: 'from_segment',
+        to_segment: 'to_segment',
+        location: 'relative_location',
+        subtype: 'asset_subtypes.name',
+        main_line: 'infrastructure_divisions.name',
+        branch: 'infrastructure_subdivisions.name',
+        number_of_tracks: 'num_tracks',
+        location: 'relative_locations.name',
+        segment_type: 'infrastructure_segment_types.name'
+      },
+    power_signal:
+      { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        description: 'description',
+        from_line: 'from_line',
+        to_line: 'to_line',
+        from_segment: 'from_segment',
+        to_segment: 'to_segment',
+        location: 'relative_location',
+        subtype: 'asset_subtypes.name',
+        main_line: 'infrastructure_divisions.name',
+        branch: 'infrastructure_subdivisions.name',
+        location: 'relative_locations.name',
+        segment_type: 'infrastructure_segment_types.name'
+      },
+    capital_equipment:
+      { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        description: 'description',
+        manufacturer: 'manufacturers.name',
+        model: 'manufacturer_models.name',
+        year: 'manufacture_year',
+        type: 'fta_equipment_types.name',
+        subtype: 'asset_subtypes.name'
+      },
+    service_vehicle:
+      { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        vin: 'serial_number',
+        manufacturer: 'manufacturers.name',
+        model: 'manufacturer_models.name',
+        year: 'manufacture_year',
+        type: 'fta_equipment_types.name',
+        subtype: 'asset_subtypes.name'
+      },
+    bus:
+      { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        vin: 'serial_number',
+        manufacturer: 'manufacturers.name',
+        model: 'manufacturer_models.name',
+        year: 'manufacture_year',
+        type: 'fta_equipment_types.name',
+        subtype: 'asset_subtypes.name'
+      },
+    rail_car: { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        vin: 'serial_number',
+        manufacturer: 'manufacturers.name',
+        model: 'manufacturer_models.name',
+        year: 'manufacture_year',
+        type: 'fta_equipment_types.name',
+        subtype: 'asset_subtypes.name'
+      },
+    ferry: { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        vin: 'serial_number',
+        manufacturer: 'manufacturers.name',
+        model: 'manufacturer_models.name',
+        year: 'manufacture_year',
+        type: 'fta_equipment_types.name',
+        subtype: 'asset_subtypes.name'
+      },
+    other_passenger_vehicle: 
+      { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        vin: 'serial_number',
+        manufacturer: 'manufacturers.name',
+        model: 'manufacturer_models.name',
+        year: 'manufacture_year',
+        type: 'fta_equipment_types.name',
+        subtype: 'asset_subtypes.name'
+      },
+    passenger_facility:
+      { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        facility_name: 'facility_name',
+        year: 'manufacture_year',
+        type: 'fta_equipment_types.name',
+        subtype: 'asset_subtypes.name'
+      },
+    admin_facility:
+      { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        facility_name: 'facility_name',
+        year: 'manufacture_year',
+        type: 'fta_equipment_types.name',
+        subtype: 'asset_subtypes.name'
+      },
+    parking_facility:
+      { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        facility_name: 'facility_name',
+        year: 'manufacture_year',
+        type: 'fta_equipment_types.name',
+        subtype: 'asset_subtypes.name'
+      },
+    maintenance_facility:
+      { 
+        asset_id: 'asset_tag',
+        org_name: 'organizations.name',
+        facility_name: 'facility_name',
+        year: 'manufacture_year',
+        type: 'fta_equipment_types.name',
+        subtype: 'asset_subtypes.name'
+      },
+    users:
+      { 
+        last_name: "last_name",
+        first_name: "first_name",
+        organization: "organizations.short_name",
+        email: "email",
+        phone: "phone",
+        phone_ext: "phone_ext",
+        title: "title"
+      },
+    projects:
+      { 
+        project_number: "project_number",
+        organization: "organizations.short_name",
+        fiscal_year: "fy_year",
+        title: "title",
+        project_type: "capital_project_types.name",
+        sogr: "sogr",
+        shadow: "notional:",
+        multi_year: "multi_year",
+        emergency: "emergency"
+      }
+
+  }
+
+end
\ No newline at end of file
diff --git a/app/models/role.rb b/app/models/role.rb
index f92eeb330..835ac71c8 100755
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -38,10 +38,6 @@ def to_s
     name
   end
 
-  def label
-    read_attribute(:label) || name.titleize
-  end
-
   def privilege?
     (privilege)
   end
diff --git a/app/models/system_config.rb b/app/models/system_config.rb
index 17c364e5d..60aca73b4 100644
--- a/app/models/system_config.rb
+++ b/app/models/system_config.rb
@@ -91,7 +91,7 @@ def self.fiscal_year(year)
         next_yr = (yr + 1)
       end
       last = "%.2d" % next_yr
-      "FY #{first}-#{last}"
+      "#{first}-#{last}"
     end
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index f23759a1a..a4677d8aa 100755
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,6 +9,8 @@ class User < ActiveRecord::Base
   # Enable user roles for this use
   rolify
 
+  serialize :user_prefs, JSON
+
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :lockable, :recoverable, :rememberable, :trackable, :validatable, :timeoutable
@@ -17,6 +19,7 @@ class User < ActiveRecord::Base
   include TransamObjectKey
 
   include TransamTokenAuthentication
+  include TablePreferences
   
   #-----------------------------------------------------------------------------
   # Callbacks
@@ -113,8 +116,7 @@ class User < ActiveRecord::Base
   scope :active, -> { where(active: true) }
 
   # default scope
-  default_scope { active.order(:last_name) }
-
+  default_scope { active.order(:last_name, :first_name) }
 
   #-----------------------------------------------------------------------------
   # Lists
@@ -309,6 +311,65 @@ def update_user_organization_filters
     self.save!
   end
 
+  #-----------------------------------------------------------------------------
+  # Generate Table Data
+  #-----------------------------------------------------------------------------
+
+  # TODO: Make this a shareable Module 
+  def rowify fields=nil
+
+    fields ||= [:last_name,
+                :first_name,
+                :organization,
+                :email,
+                :phone,
+                :phone_ext,
+                :title,
+                :role,
+                :privileges,
+                :status]
+
+    field_library = {
+      last_name: {label: "Last", method: :last_name, url: "/users/#{self.object_key}/"},
+      first_name: {label: "First", method: :first_name, url: nil},
+      organization: {label: "Organization", method: :organization, url: nil}, 
+      email: {label: "Email", method: :email, url: nil},
+      phone: {label: "Phone", method: :phone, url: nil},
+      phone_ext: {label: "Ext.", method: :phone_ext, url: nil},
+      title: {label: "Title", method: :title, url: nil},
+      role: {label: "Role", method: :role, url: nil},
+      privileges: {label: "Privileges", method: :user_privileges, url: nil},
+      status: {label: "Status", method: :status, url: nil}
+    }
+    
+    row = {}
+    fields.each do |field|
+      row[field] =  {label: field_library[field][:label], data: self.send(field_library[field][:method]).to_s, url: field_library[field][:url]} 
+    end
+    return row 
+  end
+
+  def role 
+    roles.try(:last).try(:label)
+  end
+
+  def user_privileges
+    roles.privileges.collect{|x| x.label}.join(', ')
+  end 
+
+  def status
+    active ? "Active" : "Inactive"
+  end
+
+  def last_name_drilldown
+    #drilldown link
+    #TODO: use user path instead of hard coded html
+    "<a href='/users/#{self.object_key}/'>#{self.last_name}</a>"
+  end
+
+  # End Generate Table Data
+
+
   #-----------------------------------------------------------------------------
   # Devise hooks
   #-----------------------------------------------------------------------------
@@ -341,6 +402,7 @@ def unlock_access!
   end
   #-----------------------------------------------------------------------------
 
+
   #-----------------------------------------------------------------------------
   # Protected Methods
   #-----------------------------------------------------------------------------
diff --git a/app/models/vendor.rb b/app/models/vendor.rb
index 3649ae5f3..00e5d183e 100644
--- a/app/models/vendor.rb
+++ b/app/models/vendor.rb
@@ -14,6 +14,7 @@ class Vendor < ActiveRecord::Base
   # Callbacks
   #------------------------------------------------------------------------------
   after_initialize  :set_defaults
+  before_save :remove_apostrophe
 
   #------------------------------------------------------------------------------
   # Associations common to all vendors
@@ -106,4 +107,9 @@ def set_defaults
     self.state ||= SystemConfig.instance.default_state_code
   end
 
+  # Apostrophe's break the form helpers in the vendor name.
+  def remove_apostrophe
+    self.name = self.name.gsub("'","")
+  end
+
 end
diff --git a/app/views/activity_logs/_index_table.html.haml b/app/views/activity_logs/_index_table.html.haml
index ceec2125f..9a357b802 100644
--- a/app/views/activity_logs/_index_table.html.haml
+++ b/app/views/activity_logs/_index_table.html.haml
@@ -6,34 +6,79 @@
   #table_actions.btn-group
     = render :partial => "activity_logs/index_actions"
 
-%table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
-  :pagination => 'true',
-  :show_pagination_switch => 'false',
-  :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
-  :page_size => current_user.num_table_rows,
-  :search => 'false',
-  :export_types => "['csv', 'txt', 'excel']",
-  :show_export => 'true',
-  :show_columns => 'true',
-  :show_toggle => 'true',
-  :cookie => 'true',
-  :cookie_id_table => "activity_logs_id",
-  :cookie_expire => "1y"}}
-  %thead
-    %tr
-      %th.left{:data => {:visible => 'false'}} Id
-      %th.left{:data => {:sortable => 'true'}} Date/Time
-      %th.left{:data => {:sortable => 'true'}} User
-      %th.left{:data => {:sortable => 'true'}} Action
-      %th.left{:data => {:sortable => 'true'}} Activity
-
-  %tbody
-    - @activities.each do |a|
-      %tr{:id => a.id, :class => 'action-path'}
-        %td.left= a.id
-        %td.left= format_as_date_time(a.activity_time)
-        %td.left= a.user
-        %td.left= a.item_type
-        %td.left= a.activity.truncate(64).html_safe
+= javascript_include_tag  "https://kit.fontawesome.com/#{ENV['FONT_AWESOME']}.js"
+.library-table
+  %table.elbat{:id => table_dom_id,
+    :use => 'true',
+    :data => {:use => 'true',
+      :table_code => 'activity_log',
+      :side => 'client',
+      :current_page => '0',
+      :current_page_size => '10',
+      :page_sizes => "10,20,50,100",
+      :search => 'client',
+      :export => "['csv', 'txt', 'excel']",
+      :columns => '{"0":{"name":"Action","type":"drilldown-link"},
+                    "1":{"name":"Activity"},
+                    "2":{"name":"User"},
+                    "date_time":{"name":"Date/Time","type":"right-align"},
+                    "4":{"name":"Id"}}',
+      :selected_columns => "0,1,2,date_time",
+      :cookies => "true",
+      :sort => 'client',
+      :sort_params => @params,
+      :filter => "[]",
+      :data_source => 'client',
+      :url => ''}}
+  - @activities.each_with_index do |a, index|
+
+    :javascript
+      add_row('#{table_dom_id}',
+      {
+        "0": '#{ link_to a.activity.truncate(64).html_safe, activity_log_path(a.id)}',
+        "1": "#{a.item_type}",
+        "2": "#{a.user}",
+        "date_time": "#{format_as_date_time(a.activity_time)}",
+        "4": "#{a.id}"
+      }, #{index});
+
+
+
+
+
+
+
+
+
+
+-#%table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
+-#  :pagination => 'true',
+-#  :show_pagination_switch => 'false',
+-#  :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
+-#  :page_size => current_user.num_table_rows,
+-#  :search => 'false',
+-#  :export_types => "['csv', 'txt', 'excel']",
+-#  :show_export => 'true',
+-#  :show_columns => 'true',
+-#  :show_toggle => 'true',
+-#  :cookie => 'true',
+-#  :cookie_id_table => "activity_logs_id",
+-#  :cookie_expire => "1y"}}
+-#  %thead
+-#    %tr
+-#      %th.left{:data => {:visible => 'false'}} Id
+-#      %th.left{:data => {:sortable => 'true'}} Date/Time
+-#      %th.left{:data => {:sortable => 'true'}} User
+-#      %th.left{:data => {:sortable => 'true'}} Action
+-#      %th.left{:data => {:sortable => 'true'}} Activity
+-#
+-#  %tbody
+-#    - @activities.each do |a|
+-#      %tr{:id => a.id, :class => 'action-path'}
+-#        %td.left= a.id
+-#        %td.left= format_as_date_time(a.activity_time)
+-#        %td.left= a.user
+-#        %td.left= a.item_type
+-#        %td.left= a.activity.truncate(64).html_safe
 
 = render :partial => 'shared/table_scripts', :locals => {:table_id => table_dom_id, :path_pattern => activity_log_path("xxx")}
diff --git a/app/views/activity_logs/index.html.haml b/app/views/activity_logs/index.html.haml
index a8085bd52..95a6d2664 100755
--- a/app/views/activity_logs/index.html.haml
+++ b/app/views/activity_logs/index.html.haml
@@ -1,4 +1,4 @@
-.col-xs-12.col-sm-8.col-sm-offset-2
+.col-xs-12
   .page-header
     %h2 Activity Log
   .row
diff --git a/app/views/asset_groups/_index_table.html.haml b/app/views/asset_groups/_index_table.html.haml
index 96413896b..c61b6b653 100755
--- a/app/views/asset_groups/_index_table.html.haml
+++ b/app/views/asset_groups/_index_table.html.haml
@@ -2,39 +2,84 @@
   table_dom_id = SecureRandom.hex
   show_actions ||= 0
 
+
 - if show_actions == 1
   #table_actions.btn-group
     = render :partial => "asset_groups/index_actions"
+= javascript_include_tag  "https://kit.fontawesome.com/#{ENV['FONT_AWESOME']}.js"
+.library-table
+  %table.elbat{:id => table_dom_id,
+    :use => 'true',
+    :data => {:use => 'true',
+      :table_code => 'groups',
+      :side => 'client',
+      :current_page => '0',
+      :current_page_size => '10',
+      :page_sizes => "10,20,50,100",
+      :search => 'client',
+      :export => "['csv', 'txt', 'excel']",
+      :columns => '{"name":{"name":"Group Name","type":"drilldown-link"},
+                    "1":{"name":"Group Code"},
+                    "2":{"name":"Group Description"},
+                    "3":{"name":"Asset Count"}}',
+      :selected_columns => "name,1,2,3",
+      :cookies => "true",
+      :sort => 'client',
+      :params => "{}",
+      :filter => "[]",
+      :data_source => 'client',
+      :url => ''}}
+  - @asset_groups.each_with_index do |a, index|
+
+    :javascript
+      add_row('#{table_dom_id}',
+      {
+        "name": '#{h link_to a.name, asset_group_path(a) }',
+        "1": '#{h a.code }',
+        "2": '#{h a.description }',
+        "3": '#{h format_as_integer(a.assets.count) }',
+      }, #{index});
+
+
+
+
+-# :ruby
+-#   table_dom_id = SecureRandom.hex
+-#   show_actions ||= 0
+
+-# - if show_actions == 1
+-#   #table_actions.btn-group
+-#     = render :partial => "asset_groups/index_actions"
+
+-# %table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
+-#   :pagination => 'true',
+-#   :show_pagination_switch => 'false',
+-#   :page_list => "[5, 10, 20, 50, 100, 200, 1000, 10000]",
+-#   :page_size => current_user.num_table_rows,
+-#   :search => 'false',
+-#   :toolbar => "#table_actions",
+-#   :export_types => "['csv', 'txt', 'excel']",
+-#   :show_export => 'true',
+-#   :show_columns => 'true',
+-#   :show_toggle => 'true',
+-#   :cookie => 'true',
+-#   :cookie_id_table => "asset_groups_id",
+-#   :cookie_expire => "1y"}}
+-#   %thead
+-#     %tr
+-#       %th.left{:data => {:visible => 'false'}} Object Key
+-#       %th.left{:data => {:sortable => 'true'}} Name
+-#       %th.left{:data => {:sortable => 'true'}} Code
+-#       %th.left{:data => {:sortable => 'true'}} Description
+-#       %th.right{:data => {:sortable => 'true'}} Num Assets
 
-%table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
-  :pagination => 'true',
-  :show_pagination_switch => 'false',
-  :page_list => "[5, 10, 20, 50, 100, 200, 1000, 10000]",
-  :page_size => current_user.num_table_rows,
-  :search => 'false',
-  :toolbar => "#table_actions",
-  :export_types => "['csv', 'txt', 'excel']",
-  :show_export => 'true',
-  :show_columns => 'true',
-  :show_toggle => 'true',
-  :cookie => 'true',
-  :cookie_id_table => "asset_groups_id",
-  :cookie_expire => "1y"}}
-  %thead
-    %tr
-      %th.left{:data => {:visible => 'false'}} Object Key
-      %th.left{:data => {:sortable => 'true'}} Name
-      %th.left{:data => {:sortable => 'true'}} Code
-      %th.left{:data => {:sortable => 'true'}} Description
-      %th.right{:data => {:sortable => 'true'}} Num Assets
-
-  %tbody
-    - @asset_groups.each do |a|
-      %tr{:id => a.object_key, :class => 'action-path'}
-        %td.left= a.object_key
-        %td.left= a.name
-        %td.left= a.code
-        %td.left= a.description
-        %td.right= format_as_integer(a.assets.count)
+-#   %tbody
+-#     - @asset_groups.each do |a|
+-#       %tr{:id => a.object_key, :class => 'action-path'}
+-#         %td.left= a.object_key
+-#         %td.left= a.name
+-#         %td.left= a.code
+-#         %td.left= a.description
+-#         %td.right= format_as_integer(a.assets.count)
 
 = render :partial => 'shared/table_scripts', :locals => {:table_id => table_dom_id, :path_pattern => asset_group_path("xxx")}
diff --git a/app/views/message_templates/_message_history_table.html.haml b/app/views/message_templates/_message_history_table.html.haml
index 5093503a2..b9acb3c21 100644
--- a/app/views/message_templates/_message_history_table.html.haml
+++ b/app/views/message_templates/_message_history_table.html.haml
@@ -1,41 +1,70 @@
 %legend{style: 'border-bottom: none; margin-bottom: 0px;'} Message History
 
-.table-responsive
-  #table_actions.btn-toolbar
-  %table.table.table-condensed.table-hover{:id => 'message_history_server_table',
-    :data => {:toggle => 'table',
-    :url => message_history_message_templates_path(:format => :json),
-    :card_view => "false",
-    :pagination => 'true',
-    :sort_order => 'asc',
-    :sortable => 'true',
-    :side_pagination => 'server',
-    :show_pagination_switch => 'false',
-    :page_number => '1',
-    :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
-    :page_size => current_user.num_table_rows,
-    :search => 'true',
-    :show_columns => 'true',
-    :toolbar => "#table_actions",
-    :show_export => 'true',
-    :id_field => 'object_key',
-    :export_types => "['csv', 'txt', 'excel']",
-    :cookie => 'true',
-    :cookie_id_table => "message_history_table",
-    :cookie_expire => "1y"}}
-    %thead
-      %tr
-        %th.left{:data => {:field => "object_key", :visible => 'false'}} Object Key
-        %th.left{:data => {:field => "name", :sortable => 'true', :formatter => 'message_link_formatter'}} ID
-        %th.left{:data => {:field => "subject", sortable: 'true'}} Subject
-        %th.left{:data => {:field => "description", sortable: 'true'}} Description
-        %th.left{:data => {:field => "active", :formatter => "raw_boolean_formatter", sortable: 'true'}} Active
-        %th.left{:data => {:field => "message_enabled", :formatter => "raw_boolean_formatter", sortable: 'true'}} Message
-        %th.left{:data => {:field => "email_enabled", :formatter => "raw_boolean_formatter", sortable: 'true'}} Email (External)
-        %th.left{:data => {:field => "created_at", :formatter => "date_time_formatter", sortable: 'true'}} Entry Date & Time
-        %th.left{:data => {:field => "user", sortable: 'true'}} Event By
-        %th.left{:data => {:field => "to_user", sortable: 'true'}} Sent To
-        %th.left{:data => {:field => "email_status", sortable: 'true'}} Email (External) Status
+.library-table
+  %table.elbat{:id => table_dom_id,
+  :use => 'true',
+  :data => {:use => 'true',
+    :table_code => 'message_history',
+    :side => 'server',
+    :current_page => '0',
+    :current_page_size => '10',
+    :page_sizes => "10,20,50,100",
+    :search => 'server',
+    :export => "['csv', 'txt', 'excel']",
+    :columns => '{"0":{"name":"ID","type":"drilldown-link"},
+                  "1":{"name":"Subject"},
+                  "2":{"name":"Description"},
+                  "3":{"name":"Active"},
+                  "4":{"name":"Message"},
+                  "5":{"name":"Email (External)"},
+                  "6":{"name":"Entry Date & Time","type":"right-align"},
+                  "7":{"name":"Event By"},
+                  "8":{"name":"Sent To"},
+                  "9":{"name":"Email (External) Status"}}',
+    :selected_columns => "0,1,2,3,4,5,6,7,8,9",
+    :cookies => 'true',
+    :sort => 'server',
+    :params => '',
+    :url => table_message_history_message_templates_path(:format => :json) }}
+
+
+
+-# .table-responsive
+-#   #table_actions.btn-toolbar
+-#   %table.table.table-condensed.table-hover{:id => 'message_history_server_table',
+-#     :data => {:toggle => 'table',
+-#     :url => message_history_message_templates_path(:format => :json),
+-#     :card_view => "false",
+-#     :pagination => 'true',
+-#     :sort_order => 'asc',
+-#     :sortable => 'true',
+-#     :side_pagination => 'server',
+-#     :show_pagination_switch => 'false',
+-#     :page_number => '1',
+-#     :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
+-#     :page_size => current_user.num_table_rows,
+-#     :search => 'true',
+-#     :show_columns => 'true',
+-#     :toolbar => "#table_actions",
+-#     :show_export => 'true',
+-#     :id_field => 'object_key',
+-#     :export_types => "['csv', 'txt', 'excel']",
+-#     :cookie => 'true',
+-#     :cookie_id_table => "message_history_table",
+-#     :cookie_expire => "1y"}}
+-#     %thead
+-#       %tr
+-#         %th.left{:data => {:field => "object_key", :visible => 'false'}} Object Key
+-#         %th.left{:data => {:field => "name", :sortable => 'true', :formatter => 'message_link_formatter'}} ID
+-#         %th.left{:data => {:field => "subject", sortable: 'true'}} Subject
+-#         %th.left{:data => {:field => "description", sortable: 'true'}} Description
+-#         %th.left{:data => {:field => "active", :formatter => "raw_boolean_formatter", sortable: 'true'}} Active
+-#         %th.left{:data => {:field => "message_enabled", :formatter => "raw_boolean_formatter", sortable: 'true'}} Message
+-#         %th.left{:data => {:field => "email_enabled", :formatter => "raw_boolean_formatter", sortable: 'true'}} Email (External)
+-#         %th.left{:data => {:field => "created_at", :formatter => "date_time_formatter", sortable: 'true'}} Entry Date & Time
+-#         %th.left{:data => {:field => "user", sortable: 'true'}} Event By
+-#         %th.left{:data => {:field => "to_user", sortable: 'true'}} Sent To
+-#         %th.left{:data => {:field => "email_status", sortable: 'true'}} Email (External) Status
 
 = render 'shared/table_formatters'
 
diff --git a/app/views/message_templates/_message_template_table.html.haml b/app/views/message_templates/_message_template_table.html.haml
index 588f7fc2d..0864b7ea6 100644
--- a/app/views/message_templates/_message_template_table.html.haml
+++ b/app/views/message_templates/_message_template_table.html.haml
@@ -1,53 +1,109 @@
 :ruby
   table_dom_id = SecureRandom.hex
 
-%legend{style: 'border-bottom: none; margin-bottom: 0px;'} Message Templates
-
-.table-responsive
-  #table_actions.btn-group
-    - if can? :create, MessageTemplate
-      = link_to new_message_template_path, :class => 'btn btn-primary' do
-        %i.fa.fa-plus.fa-fw
-        = " Add New Message Template";
-  %table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
-    :pagination => 'true',
-    :show_pagination_switch => 'false',
-    :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
-    :page_size => current_user.num_table_rows,
-    :search => 'false',
-    :toolbar => "#table_actions",
-    :export_types => "['csv', 'txt', 'excel']",
-    :show_export => 'true',
-    :show_columns => 'false',
-    :show_toggle => 'false',
-    :cookie => 'true',
-    :cookie_id_table => "message_templates_table",
-    :cookie_expire => "1y"}}
-    %thead
-      %tr
-        %th.center{:data => {:sortable => 'true'}} ID
-        %th.center{:data => {:sortable => 'true'}} Subject
-        %th.center{:data => {:sortable => 'true'}} Description
-        %th.center{:data => {:sortable => 'true'}} Active
-        %th.center{:data => {:sortable => 'true'}} Message
-        %th.center{:data => {:sortable => 'true'}} Email (External)
-        %th
-
-    %tbody
-      - @message_templates.each do |t|
-        %tr
-          %td
-            - if can? :update, t
-              = link_to t.name, edit_message_template_path(t)
-            - else
-              t.name
-
-          %td.left= t.subject
-          %td.left.nowrap= format_as_text(t.description)
-          %td.center.nowrap{data: {tableexport: {value: "#{(t.active && t.is_implemented) ? 'Yes' : 'No'}"}}}= format_as_boolean((t.active && t.is_implemented))
-          %td.center.nowrap{data: {tableexport: {value: "#{t.message_enabled ? 'Yes' : 'No'}"}}}= format_as_boolean(t.message_enabled)
-          %td.center.nowrap{data: {tableexport: {value: "#{t.email_enabled ? 'Yes' : 'No'}"}}}= format_as_boolean(t.email_enabled)
-          %td.center
-            - if can? :destroy, t
-              = link_to message_template_path(t), :method => :delete, title: "Remove template", :data => {:confirm => "Are you sure you want to remove this template (#{t.name})? The action can't be undone."} do
-                %i.fa.fa-trash-o.fa-fw.fa-2x
+
+#table_actions.btn-group
+  - if can? :create, MessageTemplate
+    = link_to new_message_template_path, :class => 'btn btn-primary' do
+      %i.fa.fa-plus.fa-fw
+      = " Add New Message Template";
+
+= javascript_include_tag  "https://kit.fontawesome.com/#{ENV['FONT_AWESOME']}.js"
+.library-table
+  %table.elbat{:id => table_dom_id,
+    :use => 'true',
+    :data => {:use => 'true',
+      :table_code => 'message_templates',
+      :side => 'client',
+      :current_page => '0',
+      :current_page_size => '10',
+      :page_sizes => "10,20,50,100",
+      :search => 'client',
+      :export => "['csv', 'txt', 'excel']",
+      :columns => '{"id":{"name":"ID","type":"drilldown-link"},
+                    "1":{"name":"Subject"},
+                    "2":{"name":"Description"},
+                    "3":{"name":"Active","type":"checkmark-column"},
+                    "4":{"name":"Message","type":"checkmark-column"},
+                    "5":{"name":"Email (External)","type":"checkmark-column"},
+                    "6":{"name":"Actions","type":"action-column"}}',
+      :selected_columns => "id,1,2,3,4,5,6",
+      :cookies => "true",
+      :sort => 'client',
+      :params => "{}",
+      :filter => "[]",
+      :data_source => 'client',
+      :url => ''}}
+  - @message_templates.each_with_index do |t, index|
+    %div.actions
+      - if can? :destroy, t
+        = link_to message_template_path(t), :method => :delete, title: "Remove template", :data => {:confirm => "Are you sure you want to remove this template (#{t.name})? The action can't be undone."} do
+          %i.fa.fa-trash-o.fa-fw.fa-2x
+
+
+    :javascript
+      add_row('#{table_dom_id}',
+      {                  
+        "id": '#{h link_to t.name, edit_message_template_path(t) }',
+        "1": '#{h t.subject }',
+        "2": "#{h t.description }",
+        "3": "#{h format_as_boolean((t.active && t.is_implemented)) }",
+        "4": "#{h format_as_boolean(t.message_enabled) }",
+        "5": "#{h format_as_boolean(t.email_enabled) }",
+      }, #{index});
+      // TEMP UNTIL WE DO THIS FOR REAL
+      // TODO: PLEASE DON'T LET THIS GO TO PRODUCTION
+      // HACKY HACK IS HACKY
+      add_aux_queue('#{table_dom_id}',()=>$(".actions").eq(#{index}).detach().appendTo($("##{table_dom_id} .action-column").eq(#{index}).find(".cell-text")));
+
+
+-# %legend{style: 'border-bottom: none; margin-bottom: 0px;'} Message Templates
+
+-# .table-responsive
+-#   #table_actions.btn-group
+-#     - if can? :create, MessageTemplate
+-#       = link_to new_message_template_path, :class => 'btn btn-primary' do
+-#         %i.fa.fa-plus.fa-fw
+-#         = " Add New Message Template";
+-#   %table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
+-#     :pagination => 'true',
+-#     :show_pagination_switch => 'false',
+-#     :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
+-#     :page_size => current_user.num_table_rows,
+-#     :search => 'false',
+-#     :toolbar => "#table_actions",
+-#     :export_types => "['csv', 'txt', 'excel']",
+-#     :show_export => 'true',
+-#     :show_columns => 'false',
+-#     :show_toggle => 'false',
+-#     :cookie => 'true',
+-#     :cookie_id_table => "message_templates_table",
+-#     :cookie_expire => "1y"}}
+-#     %thead
+-#       %tr
+-#         %th.center{:data => {:sortable => 'true'}} ID
+-#         %th.center{:data => {:sortable => 'true'}} Subject
+-#         %th.center{:data => {:sortable => 'true'}} Description
+-#         %th.center{:data => {:sortable => 'true'}} Active
+-#         %th.center{:data => {:sortable => 'true'}} Message
+-#         %th.center{:data => {:sortable => 'true'}} Email (External)
+-#         %th
+
+-#     %tbody
+-#       - @message_templates.each do |t|
+-#         %tr
+-#           %td
+-#             - if can? :update, t
+-#               = link_to t.name, edit_message_template_path(t)
+-#             - else
+-#               t.name
+
+-#           %td.left= t.subject
+-#           %td.left.nowrap= format_as_text(t.description)
+-#           %td.center.nowrap{data: {tableexport: {value: "#{(t.active && t.is_implemented) ? 'Yes' : 'No'}"}}}= format_as_boolean((t.active && t.is_implemented))
+-#           %td.center.nowrap{data: {tableexport: {value: "#{t.message_enabled ? 'Yes' : 'No'}"}}}= format_as_boolean(t.message_enabled)
+-#           %td.center.nowrap{data: {tableexport: {value: "#{t.email_enabled ? 'Yes' : 'No'}"}}}= format_as_boolean(t.email_enabled)
+-#           %td.center
+-#             - if can? :destroy, t
+-#               = link_to message_template_path(t), :method => :delete, title: "Remove template", :data => {:confirm => "Are you sure you want to remove this template (#{t.name})? The action can't be undone."} do
+-#                 %i.fa.fa-trash-o.fa-fw.fa-2x
diff --git a/app/views/notices/_index_table.html.haml b/app/views/notices/_index_table.html.haml
index 2b2627dda..5783727d8 100755
--- a/app/views/notices/_index_table.html.haml
+++ b/app/views/notices/_index_table.html.haml
@@ -4,67 +4,122 @@
 #table_actions.btn-group
   = render :partial => "notices/index_actions"
 
-%table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
-  :pagination => 'true',
-  :show_pagination_switch => 'false',
-  :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
-  :page_size => current_user.num_table_rows,
-  :search => 'false',
-  :toolbar => "#table_actions",
-  :export_types => "['csv', 'txt', 'excel']",
-  :show_export => 'true',
-  :show_columns => 'true',
-  :show_toggle => 'true',
-  :cookie => 'true',
-  :cookie_id_table => "noticesid",
-  :cookie_expire => "1y"}}
-  %thead
-    %th.left{:data => {:visible => 'false'}} Object Key
-    %th.left{:data => {:sortable => 'true'}} Type
-    %th.left{:data => {:sortable => 'true'}} Subject
-    %th.left{:data => {:sortable => 'true'}} Summary
-    %th.center{:data => {:sortable => 'true'}} Visible
-    %th.right{:data => {:sortable => 'true'}} Start Display
-    %th.right{:data => {:sortable => 'true'}} Display Until
-    %th.right{:data => {:visible => 'false', :sortable => 'true'}} Created At
-    %th.right{:data => {:visible => 'false', :sortable => 'true'}} Updated At
-    - if can? :update, Notice
-      %th.center Actions
-  %tbody
-    - notices.each do |notice|
-      %tr{:id => notice.object_key, :class => 'action-path'}
-        %td.left= notice.object_key
-        %td.left= notice.notice_type
-        %td.left= notice.subject
-        %td.left= notice.summary.html_safe
-        %td.center= format_as_boolean(notice.visible?)
-        %td.right= format_as_date_time(notice.display_datetime)
-        %td.right= format_as_date_time(notice.end_datetime)
-        %td.right= format_as_date_time(notice.created_at)
-        %td.right= format_as_date_time(notice.updated_at)
-        - if can? :update, notice
-          %td.center{:data => {:field => 'action-cell'}}
-            - if notice and notice.end_datetime > DateTime.current and notice.active
-              = link_to edit_notice_path(notice), :title => "Edit this notice." do
-                %i.fa.fa-fw.fa-edit.action-icon.text-info
-            - if notice.end_datetime > DateTime.current and notice.active
-              = link_to deactivate_notice_path(notice), :title => "Deactivate this notice. The notice will no longer show in the dashboard." do
-                %i.fa.fa-fw.fa-ban.action-icon.text-warning
-            - if notice.end_datetime < DateTime.current or not notice.active
-              = link_to reactivate_notice_path(notice), :title => "Reactivate this notice." do
-                %i.fa.fa-fw.fa-check.action-icon.text-success
-            - if can? :destroy, notice
-              = link_to notice_path(notice), :title => "Remove this notice", :method => :delete, :data => {:confirm => "Are you sure you want to remove this notice? The action can't be undone."} do
-                %i.fa.fa-fw.fa-trash-o.action-icon.text-danger
+= javascript_include_tag  "https://kit.fontawesome.com/#{ENV['FONT_AWESOME']}.js"
+.library-table
+  %table.elbat{:id => table_dom_id,
+    :use => 'true',
+    :data => {:use => 'true',
+      :table_code => 'notices',
+      :side => 'client',
+      :current_page => '0',
+      :current_page_size => '10',
+      :page_sizes => "10,20,50,100",
+      :search => 'client',
+      :export => "['csv', 'txt', 'excel']",
+      :columns => '{"0":{"name":"Subject","type":"drilldown-link"},
+                    "1":{"name":"Summary"},
+                    "2":{"name":"Type"},
+                    "visible":{"name":"Visible"},
+                    "4":{"name":"Start Display","type":"right-align"},
+                    "display_until":{"name":"Display Until","type":"right-align"},
+                    "6":{"name":"Created At"},
+                    "7":{"name":"Updated At"},
+                    "8":{"name":"Actions","type":"action-column"}}',
+      :selected_columns => "0,1,2,visible,4,display_until,8",
+      :cookies => "true",
+      :sort => 'client',
+      :sort_params => @params,
+      :filter => "[]",
+      :data_source => 'client',
+      :url => ''}}
+  - notices.each_with_index do |notice, index|
+    %div.actions
+      - if can? :update, notice
+        %td.center{:data => {:field => 'action-cell'}}
+          - if notice and notice.end_datetime > DateTime.current and notice.active
+            = link_to edit_notice_path(notice), :title => "Edit this notice." do
+              %i.fa.fa-fw.fa-edit.action-icon.text-info
+          - if notice.end_datetime > DateTime.current and notice.active
+            = link_to deactivate_notice_path(notice), :title => "Deactivate this notice. The notice will no longer show in the dashboard." do
+              %i.fa.fa-fw.fa-ban.action-icon.text-warning
+          - if notice.end_datetime < DateTime.current or not notice.active
+            = link_to reactivate_notice_path(notice), :title => "Reactivate this notice." do
+              %i.fa.fa-fw.fa-check.action-icon.text-success
+          - if can? :destroy, notice
+            = link_to notice_path(notice), :title => "Remove this notice", :method => :delete, :data => {:confirm => "Are you sure you want to remove this notice? The action can't be undone."} do
+              %i.fa.fa-fw.fa-trash-o.action-icon.text-danger
+    :javascript
+      add_row('#{table_dom_id}',
+      {
+        "0":'#{link_to notice.subject, notice_path(notice) }',
+        "1":"#{notice.summary.html_safe}",
+        "2":"#{notice.notice_type}",
+        "visible":"#{format_as_boolean(notice.visible?)}",
+        "4":"#{format_as_date_time(notice.display_datetime)}",
+        "display_until":"#{format_as_date_time(notice.end_datetime)}",
+        "6":"#{format_as_date_time(notice.created_at)}",
+        "7":"#{format_as_date_time(notice.updated_at)}",
+      }, #{index});
+      // TEMP UNTIL WE DO THIS FOR REAL
+      // TODO: PLEASE DON'T LET THIS GO TO PRODUCTION
+      // HACKY HACK IS HACKY
+      add_aux_queue('#{table_dom_id}',()=>$(".actions").eq(#{index}).detach().appendTo($("##{table_dom_id} .action-column").eq(#{index}).find(".cell-text")));
 
-:javascript
-  var path = "#{notice_path('xxx')}";
 
-  $('#' + '#{table_dom_id}').on('click', 'td', function () {
-    var row = $(this).parent('tr').attr('id');
 
-    if ($(this).attr('data-field') != 'action-cell') {
-      var url = path.replace("xxx", row);
-      document.location.href = url;
-    }
-  });
+
+
+-#
+-#%table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
+-#  :pagination => 'true',
+-#  :show_pagination_switch => 'false',
+-#  :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
+-#  :page_size => current_user.num_table_rows,
+-#  :search => 'false',
+-#  :toolbar => "#table_actions",
+-#  :export_types => "['csv', 'txt', 'excel']",
+-#  :show_export => 'true',
+-#  :show_columns => 'true',
+-#  :show_toggle => 'true',
+-#  :cookie => 'true',
+-#  :cookie_id_table => "noticesid",
+-#  :cookie_expire => "1y"}}
+-#  %thead
+-#    %th.left{:data => {:visible => 'false'}} Object Key
+-#    %th.left{:data => {:sortable => 'true'}} Type
+-#    %th.left{:data => {:sortable => 'true'}} Subject
+-#    %th.left{:data => {:sortable => 'true'}} Summary
+-#    %th.center{:data => {:sortable => 'true'}} Visible
+-#    %th.right{:data => {:sortable => 'true'}} Start Display
+-#    %th.right{:data => {:sortable => 'true'}} Display Until
+-#    %th.right{:data => {:visible => 'false', :sortable => 'true'}} Created At
+-#    %th.right{:data => {:visible => 'false', :sortable => 'true'}} Updated At
+-#    - if can? :update, Notice
+-#      %th.center Actions
+-#  %tbody
+-#    - notices.each do |notice|
+-#      %tr{:id => notice.object_key, :class => 'action-path'}
+-#        %td.left= notice.object_key
+-#        %td.left= notice.notice_type
+-#        %td.left= notice.subject
+-#        %td.left= notice.summary.html_safe
+-#        %td.center= format_as_boolean(notice.visible?)
+-#        %td.right= format_as_date_time(notice.display_datetime)
+-#        %td.right= format_as_date_time(notice.end_datetime)
+-#        %td.right= format_as_date_time(notice.created_at)
+-#        %td.right= format_as_date_time(notice.updated_at)
+-#        - if can? :update, notice
+-#          %td.center{:data => {:field => 'action-cell'}}
+-#            - if notice and notice.end_datetime > DateTime.current and notice.active
+-#              = link_to edit_notice_path(notice), :title => "Edit this notice." do
+-#                %i.fa.fa-fw.fa-edit.action-icon.text-info
+-#            - if notice.end_datetime > DateTime.current and notice.active
+-#              = link_to deactivate_notice_path(notice), :title => "Deactivate this notice. The notice will no longer show in the dashboard." do
+-#                %i.fa.fa-fw.fa-ban.action-icon.text-warning
+-#            - if notice.end_datetime < DateTime.current or not notice.active
+-#              = link_to reactivate_notice_path(notice), :title => "Reactivate this notice." do
+-#                %i.fa.fa-fw.fa-check.action-icon.text-success
+-#            - if can? :destroy, notice
+-#              = link_to notice_path(notice), :title => "Remove this notice", :method => :delete, :data => {:confirm => "Are you sure you want to remove this notice? The action can't be undone."} do
+-#                %i.fa.fa-fw.fa-trash-o.action-icon.text-danger
+
diff --git a/app/views/saved_queries/_index_table.html.haml b/app/views/saved_queries/_index_table.html.haml
index c6606097e..4f3bae496 100644
--- a/app/views/saved_queries/_index_table.html.haml
+++ b/app/views/saved_queries/_index_table.html.haml
@@ -2,108 +2,213 @@
   table_dom_id = SecureRandom.hex
   show_actions ||= 0
 
-:css
-  .sql-text {
-    word-break: break-all;
-  }
+= javascript_include_tag  "https://kit.fontawesome.com/#{ENV['FONT_AWESOME']}.js"
+.library-table
+  %table.elbat{:id => table_dom_id,
+    :use => 'true',
+    :data => {:use => 'true',
+      :table_code => 'saved_queries',
+      :side => 'client',
+      :current_page => '0',
+      :current_page_size => '10',
+      :page_sizes => "10,20,50,100",
+      :search => 'client',
+      :export => "['csv', 'txt', 'excel']",
+      :columns => '{"name":{"name":"Name"},
+                    "1":{"name":"Description"},
+                    "2":{"name":"Shared To"},
+                    "3":{"name":"Shared From"},
+                    "4":{"name":"SQL Query"},
+                    "5":{"name":"Created Date & Time", "type":"right-align"},
+                    "6":{"name":"Created By"},
+                    "7":{"name":"Last Updated Date & Time", "type":"right-align"},
+                    "8":{"name":"Last Updated By"},
+                    "9":{"name":"Actions", "type":"action-column"}}',
+        :selected_columns => "name,1,2,3,4,5,6,7,8,9",
+      :cookies => "true",
+      :sort => 'client',
+      :params => "{}",
+      :filter => "[]",
+      :data_source => 'client',
+      :url => ''}}
+- @queries.each_with_index do |s, index|
+  :javascript
+    add_row('#{table_dom_id}',
+    {        
+      "name": '#{h s.name }',
+      "1": '#{h s.description }',
+      "2": '#{h s.organizations.count > 1 ? "Multiple" : s.organizations.first.try(:to_s) }',
+      "3": '#{h s.created_by_user.try(:organization) }',
+      "4": '#{h s.to_sql }', // WTF
+      "5": '#{h format_as_date_time(s.created_at) }',
+      "6": '#{h s.created_by_user }',
+      "7": '#{h format_as_date_time(s.updated_at) }',
+      "8": '#{h s.updated_by_user }',
+    }, #{index});
+  %div.actions
+    - if can?(:update, s)
+      = link_to saved_query_path(s), :title => "Update this query." do
+        %i.fa.fa-fw.fa-edit.text-primary.fa-1-5x
+    - if can?(:delete, s)
+      = link_to saved_query_path(s), :title => "Delete this query", :method => :delete, :data => {:confirm => "Are you sure you want to delete this query? The action can't be undone."} do
+        %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x
+    - elsif can?(:remove, s)
+      - shared_org_ids = (s.organization_ids || []) & (current_user.organization_ids || [])
+      - if shared_org_ids.size > 1
+        = link_to show_remove_form_saved_query_path(s), :title => "Remove this query from your organization", :remote => true do
+          %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x
+      - elsif shared_org_ids.size == 1
+        = link_to remove_from_orgs_saved_query_path(s, saved_query:{organization_ids: shared_org_ids}), :title => "Remove this query from your organization", :method => :post, :data => {:confirm => "Are you sure you want to remove this query from your organization? The action can't be undone."} do
+          %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x
+    = link_to clone_saved_query_path(s), :title => "Clone this query", :method => :post do
+      %i.fa.fa-fw.fa-copy.fa-1-5x
+    = link_to export_saved_query_path(s, format: :csv), :title => "Export CSV" do
+      %i.fa.fa-fw.fa-download.fa-1-5x
+  :javascript
+    // TEMP UNTIL WE DO THIS FOR REAL
+    // TODO: PLEASE DON'T LET THIS GO TO PRODUCTION
+    // HACKY HACK IS HACKY
+    add_aux_queue('#{table_dom_id}',()=>$(".actions").eq(#{index}).detach().appendTo($("##{table_dom_id} .action-column").eq(#{index}).find(".cell-text")));
+    
 
-%table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
-  :pagination => 'true',
-  :show_pagination_switch => 'false',
-  :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
-  :page_size => current_user.num_table_rows,
-  :search => 'false',
-  :export_types => "['csv', 'txt', 'excel']",
-  :show_export => 'false',
-  :show_columns => 'false',
-  :show_toggle => 'false',
-  :cookie => 'true',
-  :cookie_id_table => "saved_queries_id",
-  :cookie_expire => "1y"}}
-  %thead
-    %tr
-      %th.left{:data => {:visible => 'false'}} Object Key
-      %th.center{:data => {:sortable => 'true'}} Name
-      %th.center{:data => {:sortable => 'true'}} Description
-      %th.center{:data => {:sortable => 'true'}} Shared To
-      %th.center{:data => {:sortable => 'true'}} Shared From
-      %th.center{:data => {:visible => 'true', :sortable => 'false'}} SQL Query
-      %th.center{:data => {:visible => 'true', :sortable => 'true'}} Created Date & Time
-      %th.center{:data => {:visible => 'true', :sortable => 'false'}} Created By
-      %th.center{:data => {:visible => 'true', :sortable => 'false'}} Last Update Date & Time
-      %th.center{:data => {:visible => 'true', :sortable => 'false'}} Last Updated By
-      %th.center{:data => {:visible => 'true', :sortable => 'false'}} 
+-# "##{table_dom_id} > tbody > tr > .action-column > .cell-text:nth-child("+index+")"
 
-  %tbody
-    - @queries.each do |s|
-      - s.organization_list = @organization_list
-      - is_own_query = current_user && current_user.id == s.created_by_user_id
-      %tr{:id => s.object_key}
-        %td.left= s.object_key
-        %td.center= s.name
-        %td.lecenterft= s.description.html_safe
-        %td.center
-          - if can?(:share, s) && s.shared?
-            - if s.organizations.count > 1
-              %span.hidden
-                Multiple
-              %a.transam-popover{href: '#', data: {toggle: 'popover', content: s.organizations.pluck(:short_name).join('<br>').html_safe}, title: 'Shared To'}
-                Multiple
-            - else
-              = s.organizations.first.try(:to_s)
-        %td.center
-          - unless is_own_query
-            = s.created_by_user.try(:organization)
-        %td.center
-          %a.sql-popover{href: '#', data: {toggle: 'popover', content: "<div class='col-sm-12 sql-text'>#{s.to_sql.html_safe}</div>"}, title: 'SQL Query'}
-            Click to Show SQL
-        %td.center= format_as_date_time(s.created_at)
-        %td.center= s.created_by_user
-        %td.center= format_as_date_time(s.updated_at)
-        %td.center= s.updated_by_user
-        %td.right
-          - if can?(:update, s)
-            = link_to saved_query_path(s), :title => "Update this query." do
-              %i.fa.fa-fw.fa-edit.text-primary.fa-1-5x
-          - if can?(:delete, s)
-            = link_to saved_query_path(s), :title => "Delete this query", :method => :delete, :data => {:confirm => "Are you sure you want to delete this query? The action can't be undone."} do
-              %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x
-          - elsif can?(:remove, s)
-            - shared_org_ids = (s.organization_ids || []) & (current_user.organization_ids || [])
-            - if shared_org_ids.size > 1
-              = link_to show_remove_form_saved_query_path(s), :title => "Remove this query from your organization", :remote => true do
-                %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x
-            - elsif shared_org_ids.size == 1
-              = link_to remove_from_orgs_saved_query_path(s, saved_query:{organization_ids: shared_org_ids}), :title => "Remove this query from your organization", :method => :post, :data => {:confirm => "Are you sure you want to remove this query from your organization? The action can't be undone."} do
-                %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x
-          = link_to clone_saved_query_path(s), :title => "Clone this query", :method => :post do
-            %i.fa.fa-fw.fa-copy.fa-1-5x
-          = link_to export_saved_query_path(s, format: :csv), :title => "Export CSV" do
-            %i.fa.fa-fw.fa-download.fa-1-5x
+-# - if shared_org_ids.size > 1
+-#                = link_to show_remove_form_saved_query_path(s), :title => "Remove this query from your organization", :remote => true do
+-#                  %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x
+-#              - elsif shared_org_ids.size == 1
+-#                = link_to remove_from_orgs_saved_query_path(s, saved_query:{organization_ids: shared_org_ids}), :title => "Remove this query from your organization", :method => :post, :data => {:confirm => "Are you sure you want to remove this query from your organization? The action can't be undone."} do
+-#                  %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x
+-#            = link_to clone_saved_query_path(s), :title => "Clone this query", :method => :post do
+-#              %i.fa.fa-fw.fa-copy.fa-1-5x
+-#            = link_to export_saved_query_path(s, format: :csv), :title => "Export CSV" do
+-#              %i.fa.fa-fw.fa-download.fa-1-5x}',
+-# '#{ can?(:update, s) ? link_to saved_query_path(s) %i.fa.fa-fw.fa-edit.text-primary.fa-1-5x : "" }' +
+-#            '#{ can?(:delete, s) ? link_to saved_query_path(s), :title => "Delete this query", :method => :delete, :data => {:confirm => "Are you sure you want to delete this query? The action can\'t be undone."} do %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x : can?(:remove, s) ? shared_org_ids = (s.organization_ids || []) & (current_user.organization_ids || []) : "" }',
+          
+-# %table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
+-#   :pagination => 'true',
+-#   :show_pagination_switch => 'false',
+-#   :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
+-#   :page_size => current_user.num_table_rows,
+-#   :search => 'false',
+-#   :export_types => "['csv', 'txt', 'excel']",
+-#   :show_export => 'false',
+-#   :show_columns => 'false',
+-#   :show_toggle => 'false',
+-#   :cookie => 'true',
+-#   :cookie_id_table => "saved_queries_id",
+-#   :cookie_expire => "1y"}}
+-#   %thead
+-#     %tr
+-#       %th.left{:data => {:visible => 'false'}} Object Key
+-#       %th.center{:data => {:sortable => 'true'}} Name
+-#       %th.center{:data => {:sortable => 'true'}} Description
+-#       %th.center{:data => {:sortable => 'true'}} Shared To
+-#       %th.center{:data => {:sortable => 'true'}} Shared From
+-#       %th.center{:data => {:visible => 'true', :sortable => 'false'}} SQL Query
+-#       %th.center{:data => {:visible => 'true', :sortable => 'true'}} Created Date & Time
+-#       %th.center{:data => {:visible => 'true', :sortable => 'false'}} Created By
+-#       %th.center{:data => {:visible => 'true', :sortable => 'false'}} Last Update Date & Time
+-#       %th.center{:data => {:visible => 'true', :sortable => 'false'}} Last Updated By
+-#       %th.center{:data => {:visible => 'true', :sortable => 'false'}} 
+
+-#   %tbody
+-#     - @queries.each do |s|
+-#       - s.organization_list = @organization_list
+-#       - is_own_query = current_user && current_user.id == s.created_by_user_id
+-#       %tr{:id => s.object_key}
+-#         %td.left= s.object_key
+-#         %td.center= s.name
+-#         %td.lecenterft= s.description.html_safe
+-#         %td.center
+-#           - if can?(:share, s) && s.shared?
+-#             - if s.organizations.count > 1
+-#               %span.hidden
+-#                 Multiple
+-#               %a.transam-popover{href: '#', data: {toggle: 'popover', content: s.organizations.pluck(:short_name).join('<br>').html_safe}, title: 'Shared To'}
+-#                 Multiple
+-#             - else
+-#               = s.organizations.first.try(:to_s)
+-#         %td.center
+-#           - unless is_own_query
+-#             = s.created_by_user.try(:organization)
+-#         %td.center
+-#           %a.sql-popover{href: '#', data: {toggle: 'popover', content: "<div class='col-sm-12 sql-text'>#{s.to_sql.html_safe}</div>"}, title: 'SQL Query'}
+-#             Click to Show SQL
+-#         %td.center= format_as_date_time(s.created_at)
+-#         %td.center= s.created_by_user
+-#         %td.center= format_as_date_time(s.updated_at)
+-#         %td.center= s.updated_by_user
+-#         %td.right
+-#           - if can?(:update, s)
+-#             = link_to saved_query_path(s), :title => "Update this query." do
+-#               %i.fa.fa-fw.fa-edit.text-primary.fa-1-5x
+-#           - if can?(:delete, s)
+-#             = link_to saved_query_path(s), :title => "Delete this query", :method => :delete, :data => {:confirm => "Are you sure you want to delete this query? The action can't be undone."} do
+-#               %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x
+-#           - elsif can?(:remove, s)
+-#             - shared_org_ids = (s.organization_ids || []) & (current_user.organization_ids || [])
+-#             - if shared_org_ids.size > 1
+-#               = link_to show_remove_form_saved_query_path(s), :title => "Remove this query from your organization", :remote => true do
+-#                 %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x
+-#             - elsif shared_org_ids.size == 1
+-#               = link_to remove_from_orgs_saved_query_path(s, saved_query:{organization_ids: shared_org_ids}), :title => "Remove this query from your organization", :method => :post, :data => {:confirm => "Are you sure you want to remove this query from your organization? The action can't be undone."} do
+-#                 %i.fa.fa-fw.fa-trash-o.action-icon.text-danger.fa-1-5x
+-#           = link_to clone_saved_query_path(s), :title => "Clone this query", :method => :post do
+-#             %i.fa.fa-fw.fa-copy.fa-1-5x
+-#           = link_to export_saved_query_path(s, format: :csv), :title => "Export CSV" do
+-#             %i.fa.fa-fw.fa-download.fa-1-5x
 
 = render :partial => 'shared/table_scripts', :locals => {:table_id => table_dom_id, :path_pattern => "#"}
 
-.modal.fade#form-modal{:tabindex => -1, :role => 'dialog', :aria => {:hidden => true}}
+-# .modal.fade#form-modal{:tabindex => -1, :role => 'dialog', :aria => {:hidden => true}}
+
+-# :javascript
+
+-#   $(function(){
+-#     $('#' + '#{table_dom_id}').on('post-body.bs.table', function () {
+-#       $('.sql-popover').popover({
+-#         html: 'true',
+-#         animation: true,
+-#         container: 'body'
+-#       });
+
+-#       $('.sql-popover').on('click', function (e) {
+-#         $('.sql-popover').not(this).popover('hide');
+-#       });
+
+-#       $('body').on('click', function (e) {
+-#         if ($(e.target).data('toggle') !== 'popover'
+-#         && $(e.target).parents('.popover.in').length === 0) { 
+-#           $('.sql-popover').popover('hide');
+-#         }
+-#       });
+-#     });
+-#   });
 
-:javascript
 
-  $(function(){
-    $('#' + '#{table_dom_id}').on('post-body.bs.table', function () {
-      $('.sql-popover').popover({
-        html: 'true',
-        animation: true,
-        container: 'body'
-      });
 
-      $('.sql-popover').on('click', function (e) {
-        $('.sql-popover').not(this).popover('hide');
-      });
 
-      $('body').on('click', function (e) {
-        if ($(e.target).data('toggle') !== 'popover'
-        && $(e.target).parents('.popover.in').length === 0) { 
-          $('.sql-popover').popover('hide');
-        }
-      });
-    });
-  });
+-# "Actions":  '#{\n
+-#            - if can?(:update, s) \n
+-#               link_to saved_query_path(s), :title => "Update this query." "<i class=".fa .fa-fw .fa-edit .text-primary .fa-1-5x">" \n
+-#            end }' + 
+-#            '#{- if can?(:delete, s) \n
+-#               link_to saved_query_path(s), :title => "Delete this query", :method => :delete, :data => {:confirm => "Are you sure you want to delete this query? The action can\'t be undone."} "<i class=".fa .fa-fw .fa-trash-o .action-icon .text-danger .fa-1-5x" >" \n
+-#             end \n
+-#            - elsif can?(:remove, s) \n
+-#              - shared_org_ids = (s.organization_ids || []) & (current_user.organization_ids || []) \n
+-#              - if shared_org_ids.size > 1 \n
+-#                 link_to show_remove_form_saved_query_path(s), :title => "Remove this query from your organization", :remote => true do \n
+-#                 "<i class".fa .fa-fw .fa-trash-o .action-icon .text-danger .fa-1-5x" >" \n
+-#              end \n
+-#              - elsif shared_org_ids.size == 1 \n
+-#                 link_to remove_from_orgs_saved_query_path(s, saved_query:{organization_ids: shared_org_ids}), :title => "Remove this query from your organization", :method => :post, :data => {:confirm => "Are you sure you want to remove this query from your organization? The action can\'t be undone."} do \n
+-#                 "<i class=".fa .fa-fw .fa-trash-o .action-icon .text-danger .fa-1-5x" >" \n
+-#              end \n
+-#            end \n }' +
+-#            '#{link_to clone_saved_query_path(s), :title => "Clone this query", :method => :post do \n
+-#              "<i class=".fa .fa-fw .fa-copy .fa-1-5x" >" \n
+-#            link_to export_saved_query_path(s, format: :csv), :title => "Export CSV" do \n
+-#              "<i class".fa .fa-fw .fa-download .fa-1-5x" >" }', 
\ No newline at end of file
diff --git a/app/views/uploads/_index_table.html.haml b/app/views/uploads/_index_table.html.haml
index be9aaa83b..ee54f0ee0 100755
--- a/app/views/uploads/_index_table.html.haml
+++ b/app/views/uploads/_index_table.html.haml
@@ -6,57 +6,116 @@
   #table_actions.btn-toolbar
     = render :partial => "uploads/index_actions"
 
-%table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
-  :pagination => 'true',
-  :show_pagination_switch => 'false',
-  :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
-  :page_size => current_user.num_table_rows,
-  :search => 'false',
-  :toolbar => "#table_actions",
-  :export_types => "['csv', 'txt', 'excel']",
-  :show_export => 'true',
-  :show_columns => 'true',
-  :show_toggle => 'true',
-  :cookie => 'true',
-  :cookie_id_table => "uploadsid",
-  :cookie_expire => "1y"}}
-  %thead
-    %th.left{:data => {:visible => 'false'}} Object Key
-    - unless SystemConfigFieldCustomization.find_by(table_name: 'uploads', field_name: 'organization_id', is_visible: false)
-      %th.left{:data => {:sortable => 'true'}} Agency
-    %th.left{:data => {:sortable => 'true'}} File Name
-    %th.left{:data => {:sortable => 'true'}} Content
-    %th.left{:data => {:sortable => 'true'}} Loaded By
-    %th.center{:data => {:sortable => 'true'}} Status
-    %th.right{:data => {:sortable => 'true'}} Num Rows Processed
-    %th.right{:data => {:visible => 'true', :sortable => 'true'}} Num Rows Added
-    %th.right{:data => {:visible => 'false', :sortable => 'true'}} Num Rows Replaced
-    %th.right{:data => {:visible => 'false', :sortable => 'true'}} Num Rows Skipped
-    %th.right{:data => {:visible => 'true', :sortable => 'true'}} Num Rows Failed
-    %th.right{:data => {:visible => 'false', :sortable => 'true'}} Processing Started
-    %th.right{:data => {:visible => 'false', :sortable => 'true'}} Processing Completed
-    %th.right{:data => {:sortable => 'true'}} Processing Time (s)
-    %th.right{:data => {:sortable => 'true'}} Uploaded At
-  %tbody
-    - @uploads.each do |f|
-      %tr{:id => f.object_key, :class => 'action-path'}
-        %td.left= f.object_key
-        - unless SystemConfigFieldCustomization.find_by(table_name: 'uploads', field_name: 'organization_id', is_visible: false)
-          %td.left= f.organization.present? ? f.organization.to_s : 'Multi Org'
-        %td.left= f.original_filename
-        %td.left= f.file_content_type
-        %td.left= f.user.name
-        %td.center= f.file_status_type
-
-        %td.right= format_as_integer(f.num_rows_processed)
-        %td.right= format_as_integer(f.num_rows_added)
-        %td.right= format_as_integer(f.num_rows_replaced)
-        %td.right= format_as_integer(f.num_rows_skipped)
-        %td.right= format_as_integer(f.num_rows_failed)
-
-        %td.right= format_as_date_time(f.processing_started_at)
-        %td.right= format_as_date_time(f.processing_completed_at)
-        %td.right= format_as_integer(f.processing_time.to_i)
-        %td.right= format_as_date_time(f.created_at)
+
+
+
+= javascript_include_tag  "https://kit.fontawesome.com/#{ENV['FONT_AWESOME']}.js"
+.library-table
+  %table.elbat{:id => table_dom_id,
+    :use => 'true',
+    :data => {:use => 'true',
+      :table_code => 'bulk_updates',
+      :side => 'client',
+      :current_page => '0',
+      :current_page_size => '10',
+      :page_sizes => "10,20,50,100",
+      :search => 'client',
+      :export => "['csv', 'txt', 'excel']",
+      :columns => '{"0":{"name":"File Name","type":"drilldown-link"},
+                    "1":{"name":"Organization"},
+                    "2":{"name":"Content"},
+                    "3":{"name":"Loaded By"},
+                    "4":{"name":"Status"},
+                    "5":{"name":"Num Rows Processed"},
+                    "6":{"name":"Num Rows Added"},
+                    "7":{"name":"Num Rows Failed"},
+                    "8":{"name":"Processing Time (s)"},
+                    "uploaded_at":{"name":"Uploaded At","type":"right-align"},
+                    "10":{"name":"Num Rows Replaced"},
+                    "11":{"name":"Num Rows Skipped"},
+                    "12":{"name":"Processing Started"},
+                    "13":{"name":"Processing Completed"}}',
+      :selected_columns => "0,1,2,3,4,5,6,7,8,uploaded_at",
+      :cookies => "true",
+      :sort => 'client',
+      :params => "{}",
+      :filter => "[]",
+      :data_source => 'client',
+      :url => ''}}
+  - @uploads.each_with_index do |f, index|
+    :javascript
+      add_row('#{table_dom_id}',
+      {
+        "0": '#{h link_to f.original_filename, upload_path(f)}',
+        "1": '#{h f.organization.present? ? f.organization.to_s : "Multi Org" }',
+        "2": '#{h f.file_content_type }',
+        "3": '#{h f.user.name }',
+        "4": '#{h f.file_status_type }',
+        "5": '#{h format_as_integer(f.num_rows_processed) }',
+        "6": '#{h format_as_integer(f.num_rows_added) }',
+        "7": '#{h format_as_integer(f.num_rows_failed) }',
+        "8": '#{h format_as_integer(f.processing_time.to_i) }',
+        "uploaded_at": '#{h format_as_date_time(f.created_at) }',
+        "10": '#{h format_as_integer(f.num_rows_replaced) }',
+        "11": '#{h format_as_integer(f.num_rows_skipped) }',
+        "12": '#{h format_as_date_time(f.processing_started_at) }',
+        "13": '#{h format_as_date_time(f.processing_completed_at) }',
+      }, #{index});
+
+
+
+
+-# %table.table.table-hover{:id => table_dom_id, :data => {:toggle => 'table',
+-#   :pagination => 'true',
+-#   :show_pagination_switch => 'false',
+-#   :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
+-#   :page_size => current_user.num_table_rows,
+-#   :search => 'false',
+-#   :toolbar => "#table_actions",
+-#   :export_types => "['csv', 'txt', 'excel']",
+-#   :show_export => 'true',
+-#   :show_columns => 'true',
+-#   :show_toggle => 'true',
+-#   :cookie => 'true',
+-#   :cookie_id_table => "uploadsid",
+-#   :cookie_expire => "1y"}}
+-#   %thead
+-#     %th.left{:data => {:visible => 'false'}} Object Key
+-#     - unless SystemConfigFieldCustomization.find_by(table_name: 'uploads', field_name: 'organization_id', is_visible: false)
+-#       %th.left{:data => {:sortable => 'true'}} Agency
+-#     %th.left{:data => {:sortable => 'true'}} File Name
+-#     %th.left{:data => {:sortable => 'true'}} Content
+-#     %th.left{:data => {:sortable => 'true'}} Loaded By
+-#     %th.center{:data => {:sortable => 'true'}} Status
+-#     %th.right{:data => {:sortable => 'true'}} Num Rows Processed
+-#     %th.right{:data => {:visible => 'true', :sortable => 'true'}} Num Rows Added
+-#     %th.right{:data => {:visible => 'false', :sortable => 'true'}} Num Rows Replaced
+-#     %th.right{:data => {:visible => 'false', :sortable => 'true'}} Num Rows Skipped
+-#     %th.right{:data => {:visible => 'true', :sortable => 'true'}} Num Rows Failed
+-#     %th.right{:data => {:visible => 'false', :sortable => 'true'}} Processing Started
+-#     %th.right{:data => {:visible => 'false', :sortable => 'true'}} Processing Completed
+-#     %th.right{:data => {:sortable => 'true'}} Processing Time (s)
+-#     %th.right{:data => {:sortable => 'true'}} Uploaded At
+-#   %tbody
+-#     - @uploads.each do |f|
+-#       %tr{:id => f.object_key, :class => 'action-path'}
+-#         %td.left= f.object_key
+-#         - unless SystemConfigFieldCustomization.find_by(table_name: 'uploads', field_name: 'organization_id', is_visible: false)
+-#           %td.left= f.organization.present? ? f.organization.to_s : 'Multi Org'
+-#         %td.left= f.original_filename
+-#         %td.left= f.file_content_type
+-#         %td.left= f.user.name
+-#         %td.center= f.file_status_type
+
+-#         %td.right= format_as_integer(f.num_rows_processed)
+-#         %td.right= format_as_integer(f.num_rows_added)
+-#         %td.right= format_as_integer(f.num_rows_replaced)
+-#         %td.right= format_as_integer(f.num_rows_skipped)
+-#         %td.right= format_as_integer(f.num_rows_failed)
+
+-#         %td.right= format_as_date_time(f.processing_started_at)
+-#         %td.right= format_as_date_time(f.processing_completed_at)
+-#         %td.right= format_as_integer(f.processing_time.to_i)
+-#         %td.right= format_as_date_time(f.created_at)
 
 = render :partial => 'shared/table_scripts', :locals => {:table_id => table_dom_id, :path_pattern => upload_path("xxx")}
diff --git a/app/views/users/_index_table.html.haml b/app/views/users/_index_table.html.haml
index f92f9cad0..c6e8e836d 100755
--- a/app/views/users/_index_table.html.haml
+++ b/app/views/users/_index_table.html.haml
@@ -6,62 +6,113 @@
   - if show_actions == 1
     = render :partial => "users/index_actions"
 
-%table.table.table-hover{:id => table_dom_id,
-  :data => {:toggle => 'table',
-  :url => users_path(:format => :json),
-  :card_view => "false",
-  :pagination => 'true',
-  :sort_order => 'asc',
-  :sortable => 'true',
-  :side_pagination => 'server',
-  :show_pagination_switch => 'false',
-  :page_number => '1',
-  :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
-  :page_size => current_user.num_table_rows,
-  :search => 'false',
-  :show_columns => 'true',
-  :toolbar => "#users_table_actions",
-  :row_style => 'row_style',
-  :click_to_select => 'true',
-  :show_export => 'true',
-  :id_field => 'object_key',
-  :export_types => "['csv', 'txt', 'excel']",
-  :cookie => 'true',
-  :cookie_id_table => "usersid",
-  :cookie_expire => "1y",
-  :maintain_selected => 'true',
-  :single_select => 'false',
-  :query_params => "query_params" }}
-
-  %thead
-    %tr
-      %th.left{:data => {:field => "object_key", :visible => 'false'}} Object Key
-      %th.left{:data => {:field => "external_id", :visible => 'false'}} External Id
-      %th.left.nowrap{:data => {:field => "last_name", :sortable => 'true', :formatter => 'link_to_user', :switchable => 'false'}} Last
-      %th.left.nowrap{:data => {:field => "first_name", :sortable => 'true'}} First
-      %th.left{:data => {:field => "organization", :sortable => 'true', :formatter => 'link_to_org'}} Primary Organization
-      %th.left{:data => {:field => "all_orgs", :visible => 'false', :sortable => 'false'}} All Organizations
-      %th.left.nowrap{:data => {:field => "email", :sortable => 'true'}} Email
-      %th.left.nowrap{:data => {:field => "phone", :sortable => 'true'}} Phone
-      %th.left.nowrap{:data => {:field => "phone_ext", :sortable => 'true'}} Ext.
-      %th.left.nowrap{:data => {:field => "title", :sortable => 'true'}} Title
-      %th.left{:data => {:field => "role_name", :sortable => 'false'}} Role
-      %th.left{:data => {:field => "privilege_names", :sortable => 'false'}} Privileges
-      %th.left{:data => {:field => "active", :sortable => 'true', :formatter => 'active_formatter'}} Status
-      %th.left{:data => {:field => "active", :visible => 'false', :sortable => 'true', :formatter => 'system_access_formatter'}} System Access
-      %th.left{:data => {:field => "timezone", :visible => 'false', :sortable => 'true'}} Timezone
-      %th.center{:data => {:field => "notify_via_email", :visible => 'false', :sortable => 'true', :formatter => 'raw_boolean_formatter'}} Send Emails
-      %th.right{:data => {:field => "num_table_rows", :visible => 'false', :sortable => 'true', :formatter => 'integer_formatter'}} Table Rows
-      - if current_user.has_role? :admin
-        %th.right{:data => {:field => "sign_in_count", :visible => 'false', :sortable => 'true', :formatter => 'integer_formatter'}} Num Logins
-        %th.right{:data => {:field => "last_sign_in_at", :visible => 'false', :sortable => 'true'}} Last Login
-        %th.left.nowrap{:data => {:field => "last_sign_in_ip", :visible => 'false', :sortable => 'true'}} Last Login IP
-        %th.right{:data => {:field => "failed_attempts", :visible => 'false', :sortable => 'true', :formatter => 'integer_formatter'}} Num Failed
-        %th.center{:data => {:field => "locked_at", :visible => 'false', :sortable => 'true', :formatter => 'raw_boolean_formatter'}} Locked
-        %th.right{:data => {:field => "created_at", :visible => 'false', :sortable => 'true'}} Created At
-        %th.right{:data => {:field => "updated_at", :visible => 'false', :sortable => 'true'}} Updated At
+:css
 
 
+= javascript_include_tag  "https://kit.fontawesome.com/#{ENV['FONT_AWESOME']}.js"
+.library-table
+  %table.elbat{:id => table_dom_id,
+  :use => 'true',
+  :data => {:use => 'true',
+    :table_code => 'users',
+    :side => 'server',
+    :current_page => '0',
+    :current_page_size => '10',
+    :page_sizes => "10,20,50,100",
+    :search => 'server',
+    :export => "['csv', 'txt', 'excel']",
+    :columns => '{"0":{"name":"Object Key"},
+                  "1":{"name":"External Id"},
+                  "last_name":{"name":"Last","type":"drilldown-link"},
+                  "first_name":{"name":"First"},
+                  "organization":{"name":"Primary Organization"},
+                  "5":{"name":"All Organizations"},
+                  "email":{"name":"Email","width":"14%"},
+                  "phone":{"name":"Phone","width":"6%"},
+                  "phone_ext":{"name":"Ext."},
+                  "title":{"name":"Title"},
+                  "role":{"name":"Role"},
+                  "privileges":{"name":"Privileges"},
+                  "status":{"name":"Status"},
+                  "13":{"name":"System Access"},
+                  "14":{"name":"Timezone"},
+                  "15":{"name":"Send Emails"},
+                  "16":{"name":"Table Rows"},
+                  "17":{"name":"Num Logins"},
+                  "18":{"name":"Last Login"},
+                  "19":{"name":"Last Login IP"},
+                  "20":{"name":"Num Failed"},
+                  "21":{"name":"Locked"},
+                  "22":{"name":"Created At"},
+                  "23":{"name":"Updated At"}}',
+    :selected_columns => "last_name,first_name,organization,email,phone,phone_ext,title,role,privileges,status",
+    :cookies => 'true',
+    :sort => 'server',
+    :params => '',
+    :url => table_users_path(:format => :json) }}
+
+
+
+
+
+-#http://localhost:3000/users.json?order=asc&limit=10&offset=0&role=&show_active_only=active&search_text=
+-#%table.table.table-hover{:id => table_dom_id,
+-#  :data => {:toggle => 'table',
+-#  :url => users_path(:format => :json),
+-#  :card_view => "false",
+-#  :pagination => 'true',
+-#  :sort_order => 'asc',
+-#  :sortable => 'true',
+-#  :side_pagination => 'server',
+-#  :show_pagination_switch => 'false',
+-#  :page_number => '1',
+-#  :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
+-#  :page_size => current_user.num_table_rows,
+-#  :search => 'false',
+-#  :show_columns => 'true',
+-#  :toolbar => "#users_table_actions",
+-#  :row_style => 'row_style',
+-#  :click_to_select => 'true',
+-#  :show_export => 'true',
+-#  :id_field => 'object_key',
+-#  :export_types => "['csv', 'txt', 'excel']",
+-#  :cookie => 'true',
+-#  :cookie_id_table => "usersid",
+-#  :cookie_expire => "1y",
+-#  :maintain_selected => 'true',
+-#  :single_select => 'false',
+-#  :query_params => "query_params" }}
+-#
+-#  %thead
+-#    %tr
+-#      %th.left{:data => {:field => "object_key", :visible => 'false'}} Object Key
+-#      %th.left{:data => {:field => "external_id", :visible => 'false'}} External Id
+-#      %th.left.nowrap{:data => {:field => "last_name", :sortable => 'true', :formatter => 'link_to_user', :switchable => 'false'}} Last
+-#      %th.left.nowrap{:data => {:field => "first_name", :sortable => 'true'}} First
+-#      %th.left{:data => {:field => "organization", :sortable => 'true', :formatter => 'link_to_org'}} Primary Organization
+-#      %th.left{:data => {:field => "all_orgs", :visible => 'false', :sortable => 'false'}} All Organizations
+-#      %th.left.nowrap{:data => {:field => "email", :sortable => 'true'}} Email
+-#      %th.left.nowrap{:data => {:field => "phone", :sortable => 'true'}} Phone
+-#      %th.left.nowrap{:data => {:field => "phone_ext", :sortable => 'true'}} Ext.
+-#      %th.left.nowrap{:data => {:field => "title", :sortable => 'true'}} Title
+-#      %th.left{:data => {:field => "role_name", :sortable => 'false'}} Role
+-#      %th.left{:data => {:field => "privilege_names", :sortable => 'false'}} Privileges
+-#      %th.left{:data => {:field => "active", :sortable => 'true', :formatter => 'active_formatter'}} Status
+-#      %th.left{:data => {:field => "active", :visible => 'false', :sortable => 'true', :formatter => 'system_access_formatter'}} System Access
+-#      %th.left{:data => {:field => "timezone", :visible => 'false', :sortable => 'true'}} Timezone
+-#      %th.center{:data => {:field => "notify_via_email", :visible => 'false', :sortable => 'true', :formatter => 'raw_boolean_formatter'}} Send Emails
+-#      %th.right{:data => {:field => "num_table_rows", :visible => 'false', :sortable => 'true', :formatter => 'integer_formatter'}} Table Rows
+-#      - if current_user.has_role? :admin
+-#        %th.right{:data => {:field => "sign_in_count", :visible => 'false', :sortable => 'true', :formatter => 'integer_formatter'}} Num Logins
+-#        %th.right{:data => {:field => "last_sign_in_at", :visible => 'false', :sortable => 'true'}} Last Login
+-#        %th.left.nowrap{:data => {:field => "last_sign_in_ip", :visible => 'false', :sortable => 'true'}} Last Login IP
+-#        %th.right{:data => {:field => "failed_attempts", :visible => 'false', :sortable => 'true', :formatter => 'integer_formatter'}} Num Failed
+-#        %th.center{:data => {:field => "locked_at", :visible => 'false', :sortable => 'true', :formatter => 'raw_boolean_formatter'}} Locked
+-#        %th.right{:data => {:field => "created_at", :visible => 'false', :sortable => 'true'}} Created At
+-#        %th.right{:data => {:field => "updated_at", :visible => 'false', :sortable => 'true'}} Updated At
+-#
+-#
+
 = render :partial => 'shared/table_scripts', :locals => {:table_id => table_dom_id, :path_pattern => user_path("xxx"), :allow_row_click => 0}
 
 :javascript
diff --git a/app/views/users/_sessions_table.html.haml b/app/views/users/_sessions_table.html.haml
index 5894f5315..29ce94aa0 100644
--- a/app/views/users/_sessions_table.html.haml
+++ b/app/views/users/_sessions_table.html.haml
@@ -1,41 +1,49 @@
-%table.table.table-hover{:id => 'user-sessions-table', :data => {:toggle => 'table',
-  :pagination => 'true',
-  :show_pagination_switch => 'false',
-  :page_list => "[5, 10, 20, 50, 100, 200, 10000]",
-  :page_size => current_user.num_table_rows,
-  :search => 'false',
-  :export_types => "['csv', 'txt', 'excel']",
-  :show_export => 'true',
-  :show_columns => 'true',
-  :show_toggle => 'false',
-  :cookie => 'true',
-  :cookie_id_table => "sessionsid",
-  :cookie_expire => "1y"}}
-  %thead
-    %tr
-      %th.center.nowrap{:data => {:visible => 'false', :sortable => 'true'}} Session Id
-      %th.center.nowrap{:data => {:sortable => 'true'}} User
-      %th.center.nowrap{:data => {:sortable => 'true'}} IP Addr
-      %th.center.nowrap{:data => {:sortable => 'true'}} Organization
-      %th.center.nowrap{:data => {:sortable => 'true'}} Started
-      %th.center.nowrap{:data => {:sortable => 'true'}} Expires
-      %th.center.nowrap{:data => {:sortable => 'true'}} Age
-      %th.center.nowrap{:data => {:sortable => 'true'}} Last View Time
-      %th.center.nowrap{:data => {:sortable => 'true'}} Inactive Time
-      %th.left.nowrap{:data => {:sortable => 'true'}} View Count
-      %th.left.nowrap{:data => {:sortable => 'true'}} Last View
-  %tbody
-    - @sessions.keys.each do |s|
-      - user = User.find_by(:id => @sessions[s][:user_id])
-      %tr
-        %td= s
-        %td= user.name unless user.blank?
-        %td= @sessions[s][:ip_addr]
-        %td= user.organization.to_s unless user.blank?
-        %td= format_as_date_time(@sessions[s][:start_time])
-        %td= format_as_date_time(@sessions[s][:expire_time])
-        %td= format_as_time_difference((Time.now - @sessions[s][:start_time]).to_i) unless @sessions[s][:start_time].blank?
-        %td= format_as_date_time(@sessions[s][:last_view])
-        %td= format_as_time_difference((Time.now - @sessions[s][:last_view]).to_i) unless @sessions[s][:last_view].blank?
-        %td.center= format_as_integer(@sessions[s][:views])
-        %td= @sessions[s][:path]
+:ruby
+  table_dom_id = SecureRandom.hex
+= javascript_include_tag  "https://kit.fontawesome.com/#{ENV['FONT_AWESOME']}.js"
+.library-table
+  %table.elbat{:id => table_dom_id,
+    :use => 'true',
+    :data => {:use => 'true',
+      :table_code => 'online_users',
+      :side => 'client',
+      :current_page => '0',
+      :current_page_size => '10',
+      :page_sizes => "10,20,50,100",
+      :search => 'client',
+      :export => "['csv', 'txt', 'excel']",
+      :columns => '{"0":{"name":"Session ID"},
+                    "user":{"name":"User"},
+                    "2":{"name":"IP Address"},
+                    "3":{"name":"Organization"},
+                    "4":{"name":"Started", "type":"right-align"},
+                    "5":{"name":"Expires", "type":"right-align"},
+                    "6":{"name":"Age"},
+                    "7":{"name":"Last View Time", "type":"right-align"},
+                    "8":{"name":"Inactive Time"},
+                    "9":{"name":"View Count"},
+                    "10":{"name":"Last View"}}',
+      :selected_columns => "user,2,3,4,5,6,7,8,9,10",
+      :cookies => "true",
+      :sort => 'client',
+      :sort_params => @params,
+      :filter => "[]",
+      :data_source => 'client',
+      :url => ''}}
+
+  - @sessions.keys.each_with_index do |s, index|
+    - user = User.find_by(:id => @sessions[s][:user_id])
+    :javascript
+      add_row('#{table_dom_id}',
+      {
+        "user": '#{user.name unless user.blank?}',
+        "2": "#{@sessions[s][:ip_addr]}",
+        "3": "#{user.organization.to_s unless user.blank?}",
+        "4": "#{format_as_date_time(@sessions[s][:start_time])}",
+        "5": "#{format_as_date_time(@sessions[s][:expire_time])}",
+        "6": "#{format_as_time_difference((Time.now - @sessions[s][:start_time]).to_i) unless @sessions[s][:start_time].blank?}",
+        "7": "#{format_as_date_time(@sessions[s][:last_view])}",
+        "8": "#{format_as_time_difference((Time.now - @sessions[s][:last_view]).to_i) unless @sessions[s][:last_view].blank?}",
+        "9": "#{center= format_as_integer(@sessions[s][:views])}",
+        "10": "#{@sessions[s][:path]}"
+      }, #{index});
diff --git a/app/views/users/sessions.html.haml b/app/views/users/sessions.html.haml
index 97694ddaf..cdb5e066b 100644
--- a/app/views/users/sessions.html.haml
+++ b/app/views/users/sessions.html.haml
@@ -1,18 +1,17 @@
-.col-xs-12.col-sm-10.col-sm-offset-1
+.col-md-12
   .page-header
-    %h2 Active User Sessions
+    %h2 Online Users
   .row
-    .col-xs-12#sessions-table-container
-      = render 'sessions_table'
+    = render 'sessions_table'
 
 = render :partial => 'shared/table_scripts', :locals => {:table_id => 'user-sessions-table', :path_pattern => user_path("xxx")}
 
 :javascript
-  var url = '#{sessions_users_path(:format => :js)}';
-  var interval = 60000;
-  setInterval(function(){
-    $.ajax({
-      url: url,
-      cache: false
-    });
-  }, interval);
+  //var url = '#{sessions_users_path(:format => :js)}';
+  //var interval = 60000;
+  //setInterval(function(){
+  //  $.ajax({
+  //    url: url,
+  //    cache: false
+  //  });
+  //}, interval);
diff --git a/config/routes.rb b/config/routes.rb
index f43d0f6ad..47df8e692 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -270,6 +270,9 @@
   resources :users do
     collection do
       get  'sessions'
+      get  'table'
+      get  'table_preferences'
+      put  'table_preferences', to: 'users#update_table_preferences'
     end
     member do
       get   'reset_password'
diff --git a/db/data_migrations/20200519012600_add_labels_to_all_roles.rb b/db/data_migrations/20200519012600_add_labels_to_all_roles.rb
new file mode 100644
index 000000000..4dd3ed893
--- /dev/null
+++ b/db/data_migrations/20200519012600_add_labels_to_all_roles.rb
@@ -0,0 +1,10 @@
+class AddLabelsToAllRoles < ActiveRecord::DataMigration
+  def up
+    Role.all.each do |r|
+      if r.label.nil?
+        r.label = r.name.titleize
+        r.save 
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/db/migrate/20200512141542_add_table_prefs_to_user.rb b/db/migrate/20200512141542_add_table_prefs_to_user.rb
new file mode 100644
index 000000000..1334d3351
--- /dev/null
+++ b/db/migrate/20200512141542_add_table_prefs_to_user.rb
@@ -0,0 +1,5 @@
+class AddTablePrefsToUser < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :table_prefs, :text
+  end
+end
diff --git a/db/migrate/20200518154632_add_view_to_get_user_role.rb b/db/migrate/20200518154632_add_view_to_get_user_role.rb
new file mode 100644
index 000000000..6e27478b9
--- /dev/null
+++ b/db/migrate/20200518154632_add_view_to_get_user_role.rb
@@ -0,0 +1,49 @@
+class AddViewToGetUserRole < ActiveRecord::Migration[5.2]
+  def change
+    
+    #Yes, this is a view, within a view, within a view.
+    #TODO: this only works if the table is relatively small. Dozens (maybe hundreds) of users.
+
+    # Create a view that matches each user with their roles
+    # user_id, role_weight, role_label
+    all_user_roles_view = <<-SQL
+      CREATE OR REPLACE VIEW all_user_roles AS
+        SELECT
+          ur.user_id AS user_id,
+          r.weight AS role_weight,
+          r.label AS role_label
+        FROM users_roles AS ur
+        LEFT JOIN roles AS r ON r.id = ur.role_id
+        LEFT JOIN users AS u  ON u.id = ur.user_id;
+    SQL
+    ActiveRecord::Base.connection.execute all_user_roles_view
+
+    # Create a view that looks like
+    # user_id, max_role_weight
+    highest_weight_user_roles_view = <<-SQL
+      CREATE OR REPLACE VIEW max_user_roles AS
+        SELECT user_id,max(role_weight) max_weight
+        FROM all_user_roles
+        GROUP BY user_id;
+      SQL
+    ActiveRecord::Base.connection.execute highest_weight_user_roles_view
+
+
+    # Create a view matching each user with their highest weighted role
+    # create a view that looks like
+    # user_id, role_label
+    highest_weight_user_roles_view_with_labels = <<-SQL
+      CREATE OR REPLACE VIEW max_user_roles_and_labels AS
+        SELECT 
+          all_user_roles.role_label,
+          all_user_roles.user_id,
+          all_user_roles.role_weight
+        FROM all_user_roles
+        INNER JOIN max_user_roles as mur 
+        ON all_user_roles.user_id = mur.user_id
+        AND all_user_roles.role_weight = mur.max_weight;
+    SQL
+    ActiveRecord::Base.connection.execute highest_weight_user_roles_view_with_labels
+
+  end
+end
diff --git a/lib/transam_core/version.rb b/lib/transam_core/version.rb
index 957d95f90..fe016f88b 100644
--- a/lib/transam_core/version.rb
+++ b/lib/transam_core/version.rb
@@ -1,3 +1,3 @@
 module TransamCore
-  VERSION = "2.10.0"
+  VERSION = "2.11.0-rc.1"
 end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 2c6fd0803..6636e5f60 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -18,6 +18,72 @@
     sign_in test_user
   end
 
+
+  describe 'GET table' do
+
+    it 'returns all users' do
+      get :table
+      user_count =  User.unscoped.joins(:organization).count
+      expect(response).to be_success
+      parsed_response = JSON.parse(response.body)
+      expect(parsed_response["count"]).to eq(user_count)
+    end
+
+    it 'returns the first 10 users' do
+      get :table,  params: {page: 0, page_size: 10}
+      expect(response).to be_success
+      parsed_response = JSON.parse(response.body)
+      expect(parsed_response["count"]).to eq(User.unscoped.joins(:organization).count)
+      expect(parsed_response["rows"].count).to eq(10)
+      expect(parsed_response["rows"].first["last_name"]["data"]).to eq(User.first.last_name)
+    end
+
+    it 'returns users associated with the last organization' do
+      org = Organization.last
+      get :table,  params: {search: org.short_name}
+      expect(response).to be_success
+      parsed_response = JSON.parse(response.body)
+      expect(parsed_response["count"]).to eq(User.where(organization: org).count)
+    end
+
+  end
+
+  describe 'GET Table Preferences' do 
+    it 'returns a users preferred tables' do 
+      get :table_preferences, params: {table_code: "users"}
+      expect(response).to be_success
+      parsed_response = JSON.parse(response.body)
+      expect(parsed_response["sort"].first["column"].to_s).to eq(TablePreferences::DEFAULT_TABLE_PREFERENCES[:users][:sort].first[:column].to_s)
+    end
+  end
+
+  describe 'PUT Table Preferences' do 
+    it 'returns a users preferred tables' do 
+      #TODO: Use strong params here. Don't let the hash key names be arbitrary.
+      params = {"table_preferences": 
+                  {
+                    "table_code": "users",
+                    "sort":[
+                      {"first_name": "descending"},
+                      {"last_name": "descending"}
+                    ]
+                  }
+                }
+
+      put :update_table_preferences, params: params
+      expect(response).to be_success
+      parsed_response = JSON.parse(response.body)
+
+      get :table_preferences, params: {table_code: "users"}
+      parsed_response = JSON.parse(response.body)
+      expect(parsed_response["sort"].first["first_name"].to_s).to eq("descending")
+
+      get :table_preferences, params: {table_code: "bus"}
+      parsed_response = JSON.parse(response.body)
+      expect(parsed_response["sort"].first["org_name"]).to eq("ascending")
+    end
+  end
+
   describe 'GET index' do
 
     describe 'users from a list of orgs' do
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
index 47f05b617..99e06a7bb 100644
--- a/spec/dummy/db/schema.rb
+++ b/spec/dummy/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_02_02_230352) do
+ActiveRecord::Schema.define(version: 2020_05_18_154632) do
 
   create_table "activities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "object_key", limit: 12
@@ -477,6 +477,7 @@
   create_table "image_classifications", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name"
     t.string "category"
+    t.integer "sort_order"
     t.boolean "active"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -906,6 +907,13 @@
     t.index ["report_type_id"], name: "reports_idx1"
   end
 
+  create_table "role_privilege_mappings", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+    t.bigint "role_id"
+    t.bigint "privilege_id"
+    t.index ["privilege_id"], name: "index_role_privilege_mappings_on_privilege_id"
+    t.index ["role_id"], name: "index_role_privilege_mappings_on_role_id"
+  end
+
   create_table "roles", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.integer "weight"
@@ -1009,6 +1017,9 @@
     t.boolean "active"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "is_visible"
+    t.string "label"
+    t.string "action_name"
   end
 
   create_table "system_configs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
@@ -1198,6 +1209,7 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "authentication_token", limit: 30
+    t.text "table_prefs"
     t.index ["authentication_token"], name: "index_users_on_authentication_token", unique: true
     t.index ["email"], name: "users_idx3"
     t.index ["object_key"], name: "users_idx1"
diff --git a/spec/dummy/db/seeds.rb b/spec/dummy/db/seeds.rb
index 4de485137..77e0ac27c 100644
--- a/spec/dummy/db/seeds.rb
+++ b/spec/dummy/db/seeds.rb
@@ -39,4 +39,13 @@
   :num_table_rows => 10
   )
 
+puts "  ensure all roles have labesl"
+Role.all.each do |r|
+  if r.label.nil?
+    r.label = r.name.titleize
+    r.save 
+  end
+end
+
+
 ActiveRecord::Base.connection.execute("ALTER TABLE `transam_core_testing`.`assets` ADD COLUMN `geometry` GEOMETRY NULL AFTER `vendor_id`;")
diff --git a/spec/models/concerns/fiscal_year_spec.rb b/spec/models/concerns/fiscal_year_spec.rb
index be5ede5c0..1b86255aa 100644
--- a/spec/models/concerns/fiscal_year_spec.rb
+++ b/spec/models/concerns/fiscal_year_spec.rb
@@ -116,7 +116,7 @@ class DummyClass
     expected_yr_end = (expected_yr+1).to_s
     expected_yr_end = expected_yr_end[-2..expected_yr_end.length]
 
-    expect(test_fy_class.current_fiscal_year).to eq("FY #{expected_yr_start}-#{expected_yr_end}")
+    expect(test_fy_class.current_fiscal_year).to eq("#{expected_yr_start}-#{expected_yr_end}")
   end
   it '.current_planning_year' do
     expected_yr = Date.today.month < 7 ? Date.today.year : Date.today.year + 1
@@ -125,20 +125,20 @@ class DummyClass
     expected_yr_end = (expected_yr+1).to_s
     expected_yr_end = expected_yr_end[-2..expected_yr_end.length]
 
-    expect(test_fy_class.current_planning_year).to eq("FY #{expected_yr_start}-#{expected_yr_end}")
+    expect(test_fy_class.current_planning_year).to eq("#{expected_yr_start}-#{expected_yr_end}")
   end
   it '.fiscal_year_on_date' do
-    expect(test_fy_class.fiscal_year_on_date(Date.new(2015,5,1))).to eq('FY 14-15')
-    expect(test_fy_class.fiscal_year_on_date(Date.new(2015,10,1))).to eq('FY 15-16')
+    expect(test_fy_class.fiscal_year_on_date(Date.new(2015,5,1))).to eq('14-15')
+    expect(test_fy_class.fiscal_year_on_date(Date.new(2015,10,1))).to eq('15-16')
   end
   it '.fiscal_year' do
-    expect(test_fy_class.fiscal_year(2015)).to eq('FY 15-16')
+    expect(test_fy_class.fiscal_year(2015)).to eq('15-16')
   end
   it '.get_all_fiscal_years' do
     fy_yr = Date.today.month < 7 ? Date.today.year - 4 - 1 : Date.today.year - 4
     results = []
     (fy_yr..test_fy_class.last_fiscal_year_year).each do |yr|
-      results << ["FY #{(yr-2000).to_s}-#{(yr-2000+1).to_s}", yr]
+      results << ["#{(yr-2000).to_s}-#{(yr-2000+1).to_s}", yr]
     end
     expect(test_fy_class.get_all_fiscal_years).to eq(test_fy_class.get_fiscal_years(Date.today - 4.years))
     expect(test_fy_class.get_all_fiscal_years).to eq(results)
@@ -147,7 +147,7 @@ class DummyClass
     it 'no date or forecasting years' do
       results = []
       (test_fy_class.current_planning_year_year..test_fy_class.last_fiscal_year_year).each do |yr|
-        results << ["FY #{(yr-2000).to_s}-#{(yr-2000+1).to_s}", yr]
+        results << ["#{(yr-2000).to_s}-#{(yr-2000+1).to_s}", yr]
       end
       expect(test_fy_class.get_fiscal_years).to eq(results)
     end
@@ -156,7 +156,7 @@ class DummyClass
       test_date2 = Date.new(2015,6,30)
       results = []
       (2014..test_fy_class.last_fiscal_year_year).each do |yr|
-        results << ["FY #{(yr-2000).to_s}-#{(yr-2000+1).to_s}", yr]
+        results << ["#{(yr-2000).to_s}-#{(yr-2000+1).to_s}", yr]
       end
       expect(test_fy_class.get_fiscal_years(test_date1)).to eq(results[1..results.length-1])
       expect(test_fy_class.get_fiscal_years(test_date2)).to eq(results)
@@ -165,7 +165,7 @@ class DummyClass
       current_planning_yr = Date.today.month < 7 ? Date.today.year : Date.today.year + 1
       results = []
       (0..4).each do |forecast_yr|
-        results << ["FY #{(current_planning_yr+forecast_yr-2000).to_s}-#{(current_planning_yr+forecast_yr-2000+1).to_s}", current_planning_yr+forecast_yr]
+        results << ["#{(current_planning_yr+forecast_yr-2000).to_s}-#{(current_planning_yr+forecast_yr-2000+1).to_s}", current_planning_yr+forecast_yr]
       end
       expect(test_fy_class.get_fiscal_years(nil,4)).to eq(results)
     end
@@ -175,7 +175,7 @@ class DummyClass
       test_date2 = Date.new(2015,6,30)
       results = []
       (2014..2021).each do |yr|
-        results << ["FY #{(yr-2000).to_s}-#{(yr-2000+1).to_s}", yr]
+        results << ["#{(yr-2000).to_s}-#{(yr-2000+1).to_s}", yr]
       end
       expect(test_fy_class.get_fiscal_years(test_date1, 6)).to eq(results[1..results.length-1])
       expect(test_fy_class.get_fiscal_years(test_date2, 7)).to eq(results)
@@ -187,7 +187,7 @@ class DummyClass
     last_year = test_fy_class.last_fiscal_year_year
     results = []
     (2010..last_year).each do |yr|
-      results << ["FY #{(yr-2000).to_s}-#{(yr-2000+1).to_s}", yr]
+      results << ["#{(yr-2000).to_s}-#{(yr-2000+1).to_s}", yr]
     end
 
     expect(test_fy_class.get_planning_fiscal_years(test_date)).to eq(results)
diff --git a/spec/models/schedule_disposition_update_event_spec.rb b/spec/models/schedule_disposition_update_event_spec.rb
index c0bae32cc..5a03cb982 100644
--- a/spec/models/schedule_disposition_update_event_spec.rb
+++ b/spec/models/schedule_disposition_update_event_spec.rb
@@ -21,7 +21,7 @@
 
   it '.get_update' do
     test_event.disposition_year = 2020
-    expect(test_event.get_update).to eq("Scheduled for disposition in FY 20-21")
+    expect(test_event.get_update).to eq("Scheduled for disposition in 20-21")
   end
 
   it '.set_defaults' do
diff --git a/spec/models/schedule_rehabilitation_update_event_spec.rb b/spec/models/schedule_rehabilitation_update_event_spec.rb
index 997994d4a..5e636b624 100644
--- a/spec/models/schedule_rehabilitation_update_event_spec.rb
+++ b/spec/models/schedule_rehabilitation_update_event_spec.rb
@@ -21,7 +21,7 @@
 
   it '.get_update' do
     test_event.rebuild_year = 2020
-    expect(test_event.get_update).to eq("Scheduled for rehabilitation in FY 20-21")
+    expect(test_event.get_update).to eq("Scheduled for rehabilitation in 20-21")
   end
 
   it '.set_defaults' do
diff --git a/spec/models/schedule_replacement_update_event_spec.rb b/spec/models/schedule_replacement_update_event_spec.rb
index e6c4759be..4b95d04db 100644
--- a/spec/models/schedule_replacement_update_event_spec.rb
+++ b/spec/models/schedule_replacement_update_event_spec.rb
@@ -36,7 +36,7 @@
 
   it '.get_update' do
     test_event.replacement_year = 2020
-    expect(test_event.get_update).to eq("Scheduled for replacement in FY 20-21. Reason: #{test_event.replacement_reason_type}.")
+    expect(test_event.get_update).to eq("Scheduled for replacement in 20-21. Reason: #{test_event.replacement_reason_type}.")
   end
 
   it '.set_defaults' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 181c55915..82b60262b 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -26,6 +26,42 @@
   #
   #------------------------------------------------------------------------------
 
+  it { should respond_to :rowify }
+
+  describe ".rowify" do 
+    it 'returns last name' do
+      expect(normal_user.rowify[:last_name][:data]).to eq(normal_user.last_name)
+      expect(normal_user.rowify[:first_name][:data]).to eq(normal_user.first_name)
+      expect(normal_user.rowify[:organization][:data]).to eq(normal_user.organization.to_s)
+      expect(normal_user.rowify[:email][:data]).to eq(normal_user.email)
+      expect(normal_user.rowify[:phone][:data]).to eq(normal_user.phone.to_s)
+      expect(normal_user.rowify[:phone_ext][:data]).to eq(normal_user.phone_ext.to_s)
+      expect(normal_user.rowify[:title][:data]).to eq(normal_user.title.to_s)
+      expect(normal_user.rowify[:role][:data]).to eq(normal_user.roles.try(:roles).try(:last).try(:label).to_s)
+      expect(normal_user.rowify[:privileges][:data]).to eq(normal_user.roles.privileges.collect{|x| x.label}.join(', '))
+      expect(normal_user.rowify[:status][:data]).to eq(normal_user.status)
+    end
+  end
+
+  
+  describe 'Get table prefs' do
+    it 'responds to table_preferences' do
+      expect(normal_user.table_preferences).to be(nil)
+    end
+
+    it 'expects the user bus table preferences to match the default' do
+      expect(normal_user.table_preferences(:buses)).to eq(TablePreferences::DEFAULT_TABLE_PREFERENCES[:buses])
+    end
+
+    it 'returns the user-specifc preferences for buses' do
+      table_prefs = eval(normal_user.table_prefs|| "{}")
+      table_prefs[:buses] = "TEST"
+      normal_user.table_prefs = table_prefs 
+      normal_user.save  
+      expect(normal_user.table_preferences(:buses)).to eq("TEST")
+    end
+  end
+
   describe ".set_defaults" do
     it 'initializes new objects correctly' do
       expect(normal_user.timezone).to eql('Eastern Time (US & Canada)')
diff --git a/spec/views/asset_events/_schedule_disposition_update_event_view.html.haml_spec.rb b/spec/views/asset_events/_schedule_disposition_update_event_view.html.haml_spec.rb
index 20faee2d7..64480b493 100644
--- a/spec/views/asset_events/_schedule_disposition_update_event_view.html.haml_spec.rb
+++ b/spec/views/asset_events/_schedule_disposition_update_event_view.html.haml_spec.rb
@@ -9,7 +9,7 @@
     assign(:asset_event, test_event)
     render
 
-    expect(rendered).to have_content('FY 10-11')
+    expect(rendered).to have_content('10-11')
     expect(rendered).to have_content(Date.today.strftime('%m/%d/%Y'))
     expect(rendered).to have_content('test comment 123')
   end
diff --git a/spec/views/asset_events/_schedule_rehabilitation_update_event_view.html.haml_spec.rb b/spec/views/asset_events/_schedule_rehabilitation_update_event_view.html.haml_spec.rb
index cc625c01c..3af7825fe 100644
--- a/spec/views/asset_events/_schedule_rehabilitation_update_event_view.html.haml_spec.rb
+++ b/spec/views/asset_events/_schedule_rehabilitation_update_event_view.html.haml_spec.rb
@@ -9,7 +9,7 @@
     assign(:asset_event, test_event)
     render
 
-    expect(rendered).to have_content('FY 10-11')
+    expect(rendered).to have_content('10-11')
     expect(rendered).to have_content(Date.today.strftime('%m/%d/%Y'))
     expect(rendered).to have_content('test comment 123')
   end
diff --git a/spec/views/asset_events/_schedule_replacement_update_event_view.html.haml_spec.rb b/spec/views/asset_events/_schedule_replacement_update_event_view.html.haml_spec.rb
index 384b4501f..d8f2b2c1d 100644
--- a/spec/views/asset_events/_schedule_replacement_update_event_view.html.haml_spec.rb
+++ b/spec/views/asset_events/_schedule_replacement_update_event_view.html.haml_spec.rb
@@ -9,7 +9,7 @@
     assign(:asset_event, test_event)
     render
 
-    expect(rendered).to have_content('FY 10-11')
+    expect(rendered).to have_content('10-11')
     expect(rendered).to have_content(ReplacementReasonType.first.to_s)
     expect(rendered).to have_content(Date.today.strftime('%m/%d/%Y'))
     expect(rendered).to have_content('test comment 123')
diff --git a/spec/views/assets/_asset_rehab_details.html.haml_spec.rb b/spec/views/assets/_asset_rehab_details.html.haml_spec.rb
index f9bce23d8..0a257b9f5 100644
--- a/spec/views/assets/_asset_rehab_details.html.haml_spec.rb
+++ b/spec/views/assets/_asset_rehab_details.html.haml_spec.rb
@@ -6,9 +6,9 @@
     test_asset = create(:buslike_asset, :scheduled_replacement_year => 2024, :scheduled_rehabilitation_year => 2025, :scheduled_disposition_year => 2026, :policy_replacement_year => 2027)
     render 'assets/asset_rehab_details', :asset => test_asset
 
-    expect(rendered).to have_content('FY 24-25')
-    expect(rendered).to have_content('FY 25-26')
-    expect(rendered).to have_content('FY 26-27')
-    expect(rendered).to have_content('FY 27-28')
+    expect(rendered).to have_content('24-25')
+    expect(rendered).to have_content('25-26')
+    expect(rendered).to have_content('26-27')
+    expect(rendered).to have_content('27-28')
   end
 end
diff --git a/spec/views/assets/_core_asset_dt_columns.html.haml_spec.rb b/spec/views/assets/_core_asset_dt_columns.html.haml_spec.rb
index 96f51325a..47546b59b 100644
--- a/spec/views/assets/_core_asset_dt_columns.html.haml_spec.rb
+++ b/spec/views/assets/_core_asset_dt_columns.html.haml_spec.rb
@@ -12,11 +12,11 @@
     expect(rendered).to have_content(test_asset.asset_tag)
     expect(rendered).to have_content(test_asset.description)
     expect(rendered).to have_link(test_asset.parent.name)
-    expect(rendered).to have_content('FY 10-11')
+    expect(rendered).to have_content('10-11')
     expect(rendered).to have_content(Date.today.year-2010)
     expect(rendered).to have_content('4.0')
     expect(rendered).to have_content(ServiceStatusType.first.code)
-    expect(rendered).to have_content('FY 24-25')
-    expect(rendered).to have_content('FY 25-26')
+    expect(rendered).to have_content('24-25')
+    expect(rendered).to have_content('25-26')
   end
 end
diff --git a/transam_core.iml b/transam_core.iml
index 90a0c6175..c224376f3 100644
--- a/transam_core.iml
+++ b/transam_core.iml
@@ -16,199 +16,235 @@
       <sourceFolder url="file://$MODULE_DIR$/spec/dummy/spec" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/spec/dummy/.bundle" />
       <excludeFolder url="file://$MODULE_DIR$/spec/dummy/components" />
+      <excludeFolder url="file://$MODULE_DIR$/spec/dummy/log" />
       <excludeFolder url="file://$MODULE_DIR$/spec/dummy/public/system" />
       <excludeFolder url="file://$MODULE_DIR$/spec/dummy/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/spec/dummy/vendor/bundle" />
       <excludeFolder url="file://$MODULE_DIR$/spec/dummy/vendor/cache" />
     </content>
-    <orderEntry type="jdk" jdkName="RVM: ruby-2.2.2" jdkType="RUBY_SDK" />
+    <orderEntry type="jdk" jdkName="RVM: ruby-2.5.3" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="CFPropertyList (v2.3.6, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actioncable (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionmailer (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionpack (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionview (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="active_record-acts_as (v3.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activejob (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activemodel (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activerecord (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activestorage (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activesupport (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="addressable (v2.5.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="arel (v9.0.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="awesome_print (v1.8.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="backports (v3.11.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.12, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bootstrap-datepicker-rails (v1.8.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bootstrap-editable-rails (v0.0.9, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bootstrap-sass (v3.2.0.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="breadcrumbs_on_rails (v3.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cancancan (v2.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="capybara (v2.6.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="carrierwave (v1.2.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="chronic (v0.10.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ckeditor (v4.2.4, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="climate_control (v0.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cocaine (v0.6.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cocoon (v1.2.11, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="codacy-coverage (v1.1.8, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="countries (v0.11.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="crass (v1.0.4, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cucumber (v3.1.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cucumber-core (v3.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cucumber-expressions (v6.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cucumber-rails (v1.6.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cucumber-tag_expressions (v1.1.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="cucumber-wire (v0.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="currencies (v0.4.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="database_cleaner (v1.7.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="devise (v4.4.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="docile (v1.3.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="domain_name (v0.5.20180417, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="erubi (v1.7.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="excon (v0.62.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="factory_bot (v4.10.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="factory_bot_rails (v4.10.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.9.25, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fission (v0.5.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog (v2.0.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-aliyun (v0.3.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-atmos (v0.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-aws (v2.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-brightbox (v0.15.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-cloudatcost (v0.1.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-core (v2.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-digitalocean (v0.3.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-dnsimple (v1.0.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-dynect (v0.0.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-ecloud (v0.3.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-google (v0.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-internet-archive (v0.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-joyent (v0.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-json (v1.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-local (v0.5.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-openstack (v0.1.27, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-ovirt (v1.1.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-powerdns (v0.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-profitbricks (v4.1.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-rackspace (v0.1.6, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-radosgw (v0.0.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-riakcs (v0.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-sakuracloud (v1.7.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-serverlove (v0.1.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-softlayer (v1.1.4, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-storm_on_demand (v0.1.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-terremark (v0.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-vmfusion (v0.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-voxel (v0.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-vsphere (v2.3.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-xenserver (v0.3.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="fog-xml (v0.1.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="font-awesome-sass (v4.7.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="formatador (v0.2.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gherkin (v5.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gritter (v1.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="haml (v5.0.4, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="haml-rails (v1.0.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="high_voltage (v3.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="html2haml (v2.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="http-cookie (v1.0.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="i18n (v1.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="i18n_data (v0.7.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="inflecto (v0.0.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ipaddress (v0.8.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="jquery-form-rails (v1.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v4.3.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="jquery-ui-rails (v6.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v2.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="liner (v0.2.4, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="loofah (v2.2.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mail (v2.5.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="marcel (v0.3.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="memoizable (v0.4.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="method_source (v0.9.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mime-types (v1.25.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mimemagic (v0.3.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.3.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.11.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.13.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="multi_test (v0.1.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mysql2 (v0.5.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="netrc (v0.11.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="nio4r (v2.3.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.8.4, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="orm_adapter (v0.5.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ovirt-engine-sdk (v4.2.4, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parslet (v1.8.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="polyglot (v0.3.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="public_suffix (v3.0.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rack (v2.0.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rack-test (v1.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails-controller-testing (v1.0.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails-data-migrations (v1.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.0.4, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails_email_validator (v0.1.4, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="railties (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v12.3.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.10.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.9.10, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rbovirt (v0.1.7, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rbvmomi (v1.13.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="responders (v2.4.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rest-client (v2.0.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rmagick (v2.16.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rolify (v5.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="roo (v2.7.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.7.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.7.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.7.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-rails (v3.7.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.7.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby_parser (v3.11.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.2.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sass (v3.5.7, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sass-listen (v4.0.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.7, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sexp_processor (v4.11.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="shoulda-matchers (v3.1.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="signed_multiset (v0.2.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simple_form (v4.0.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.16.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.10.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.2, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="state_machines (v0.5.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="state_machines-activemodel (v0.5.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="state_machines-activerecord (v0.5.1, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="temple (v0.8.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="terrapin (v0.6.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="thor (v0.20.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.6, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.8, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="treetop (v1.4.15, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="trollop (v2.1.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="uglifier (v4.1.17, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unf (v0.1.4, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.7.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unitwise (v2.2.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.7, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="websocket-driver (v0.7.0, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="websocket-extensions (v0.1.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="wicked (v1.3.3, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="xml-simple (v1.1.5, RVM: ruby-2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="xpath (v2.1.0, RVM: ruby-2.2.2) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="CFPropertyList (v2.3.6, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actioncable (v5.2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionmailer (v5.2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionpack (v5.2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionview (v5.2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activejob (v5.2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activemodel (v5.2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activerecord (v5.2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activestorage (v5.2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activesupport (v5.2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="addressable (v2.7.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="api-pagination (v4.8.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="arel (v9.0.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="autoprefixer-rails (v9.7.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="awesome_print (v1.8.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="backports (v3.15.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.13, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bootstrap-datepicker-rails (v1.9.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bootstrap-editable-rails (v0.0.9, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bootstrap-sass (v3.4.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="breadcrumbs_on_rails (v3.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="browser (v3.0.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.17.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="byebug (v11.1.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cancancan (v3.0.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="capybara (v3.31.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="carrierwave (v2.0.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="chronic (v0.10.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ckeditor (v5.0.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cocoon (v1.2.14, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.5, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="countries (v3.0.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="country_select (v4.0.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="crass (v1.0.6, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cucumber (v3.1.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cucumber-core (v3.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cucumber-expressions (v6.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cucumber-rails (v2.0.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cucumber-tag_expressions (v1.1.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cucumber-wire (v0.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="database_cleaner (v1.7.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="declarative (v0.0.10, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="declarative-option (v0.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="deep_cloneable (v3.0.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.8, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="devise (v4.7.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="domain_name (v0.5.20190701, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dry-inflector (v0.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="erubi (v1.9.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="excon (v0.72.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="factory_bot (v5.1.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="factory_bot_rails (v5.1.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faker (v2.10.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday (v0.17.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.12.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fission (v0.5.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog (v2.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-aliyun (v0.3.5, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-atmos (v0.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-aws (v3.5.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-brightbox (v0.16.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-cloudatcost (v0.4.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-cloudstack (v0.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-core (v2.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-digitalocean (v0.4.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-dnsimple (v2.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-dynect (v0.0.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-ecloud (v0.3.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-google (v1.9.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-internet-archive (v0.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-json (v1.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-local (v0.6.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-openstack (v1.0.10, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-ovirt (v1.2.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-powerdns (v0.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-profitbricks (v0.0.5, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-rackspace (v0.1.6, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-radosgw (v0.0.5, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-riakcs (v0.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-sakuracloud (v1.7.5, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-serverlove (v0.1.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-softlayer (v1.1.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-storm_on_demand (v0.1.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-terremark (v0.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-vmfusion (v0.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-voxel (v0.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-vsphere (v3.2.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-xenserver (v0.3.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fog-xml (v0.1.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="font-awesome-sass (v4.7.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="formatador (v0.2.5, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gherkin (v5.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="google-api-client (v0.23.9, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="googleauth (v0.6.7, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gritter (v1.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="haml (v5.1.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="haml-rails (v2.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="high_voltage (v3.1.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="html2haml (v2.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="http-accept (v1.7.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="http-cookie (v1.0.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="httpclient (v2.8.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="i18n (v1.8.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="i18n_data (v0.8.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="image_processing (v1.10.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ipaddress (v0.8.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.9.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jquery-form-rails (v1.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v4.3.5, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jquery-ui-rails (v6.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v2.3.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jwt (v2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="kaminari (v1.1.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="kaminari-actionview (v1.1.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="kaminari-activerecord (v1.1.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="kaminari-core (v1.1.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="liner (v0.2.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="loofah (v2.4.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mail (v2.7.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="marcel (v0.3.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="memoist (v0.16.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="memoizable (v0.4.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="method_source (v0.9.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.3.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2019.1009, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mimemagic (v0.3.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mini_magick (v4.10.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mini_mime (v1.0.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.4.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.14.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_test (v0.1.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multipart-post (v2.1.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mysql2 (v0.5.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="netrc (v0.11.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nio4r (v2.5.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.10.7, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="optimist (v3.0.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="orm_adapter (v0.5.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="os (v1.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ovirt-engine-sdk (v4.3.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="paper_trail (v10.3.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="paper_trail-association_tracking (v2.0.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="paper_trail-globalid (v0.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="parslet (v1.8.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="public_suffix (v4.0.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rack (v2.1.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rack-test (v1.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rails (v5.2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rails-controller-testing (v1.0.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.3.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rails_email_validator (v0.1.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="railties (v5.2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.10.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.10.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rbovirt (v0.1.7, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rbvmomi (v2.3.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="regexp_parser (v1.6.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="representable (v3.0.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="request_store (v1.5.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="responders (v3.0.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rest-client (v2.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="retriable (v3.1.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rmagick (v2.16.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rolify (v5.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="roo (v2.8.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="roo-xls (v1.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.9.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.9.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.9.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-rails (v3.9.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.9.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-ole (v1.2.12.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-vips (v2.0.17, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubyXL (v3.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby_parser (v3.14.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.3.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sass (v3.7.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sass-listen (v4.0.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sass-rails (v6.0.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sassc (v2.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sassc-rails (v2.1.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sexp_processor (v4.13.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="shoulda-matchers (v4.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="signed_multiset (v0.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="signet (v0.12.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simple_form (v5.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simple_token_authentication (v1.17.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sixarm_ruby_unaccent (v1.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sort_alphabetical (v1.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="spreadsheet (v1.2.6, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="state_machines (v0.5.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="state_machines-activemodel (v0.7.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="state_machines-activerecord (v0.6.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="temple (v0.8.2, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="thor (v1.0.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.6, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.10, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.6, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="uber (v0.1.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="uglifier (v4.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unf (v0.1.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.7.6, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicode_utils (v1.4.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unitwise (v2.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.8, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="websocket-driver (v0.7.1, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="websocket-extensions (v0.1.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="wicked (v1.3.4, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="xml-simple (v1.1.5, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="xpath (v3.2.0, RVM: ruby-2.5.3) [gem]" level="application" />
   </component>
   <component name="RModuleSettingsStorage">
     <LOAD_PATH number="0" />