diff --git a/expcore/gui.lua b/expcore/gui.lua
index de0cd8f9..eaa22047 100644
--- a/expcore/gui.lua
+++ b/expcore/gui.lua
@@ -1,919 +1 @@
---[[-- Core Module - Gui
-- Used to define new gui elements and gui event handlers
-@core Gui
-@alias Gui
-
-@usage-- Defining a button that prints the player's name
-local example_button =
-Gui.element{
-    type = 'button',
-    caption = 'Example Button'
-}
-:on_click(function(player,element,event)
-    player.print(player.name)
-end)
-
-@usage-- Defining a button with a custom style
-local example_button =
-Gui.element{
-    type = 'button',
-    caption = 'Example Button'
-}
-:style{
-    height = 25,
-    width = 100
-}
-:on_click(function(player,element,event)
-    player.print(player.name)
-end)
-
-@usage-- Defining a button using a custom function
-local example_flow_with_button =
-Gui.element(function(event_trigger,parent)
-    -- Add the flow the button is in
-    local flow =
-    parent.add{
-        name = 'example_flow',
-        type = 'flow'
-    }
-
-    -- Get the players name
-    local player = game.players[parent.player_index]
-    local player_name = player.name
-
-    -- Add the button
-    local element =
-    flow.add{
-        name = event_trigger,
-        type = 'button',
-        caption = 'Example Button: '..player_name
-    }
-
-    -- Set the style of the button
-    local style = element.style
-    style.height = 25
-    style.width = 100]
-    style.font_color = player.color
-
-    -- Return the element
-    return element
-end)
-:on_click(function(player,element,event)
-    player.print(player.name)
-end)
-
-@usage-- Drawing an element
-local exmple_button_element = example_button(parent)
-local example_flow_with_button = example_flow_with_button(parent)
-
-]]
-
-local Event = require 'utils.event' --- @dep utils.event
-local mod_gui = require 'mod-gui' --- @dep mod-gui
-
-local Gui = {
-    --- The current highest uid that is being used, will not increase during runtime
-    -- @field uid
-    uid = 0,
-    --- Contains the uids of the elements that will show on the top flow and the auth function
-    -- @table top_elements
-    top_elements = {},
-    --- Contains the uids of the elements that will show on the left flow and the open on join function
-    -- @table left_elements
-    left_elements = {},
-    --- Table of all the elements which have been registed with the draw function and event handlers
-    -- @table defines
-    defines = {},
-    --- An index used for debuging to find the file where different elements where registered
-    -- @table file_paths
-    file_paths = {},
-    --- An index used for debuging to show the raw data used to define an element
-    -- @table debug_info
-    debug_info = {},
-    --- The element prototype which is returned from Gui.element
-    -- @table _prototype_element
-    _prototype_element = {},
-    --- The prototype metatable applied to new element defines
-    -- @table _mt_element
-    _mt_element = {
-        __call = function(self,parent,...)
-            local element = self._draw(self.name,parent,...)
-            if self._style then self._style(element.style,element,...) end
-            return element
-        end
-    }
-}
-
-Gui._mt_element.__index = Gui._prototype_element
-
---- Element Define.
--- @section elementDefine
-
---[[-- Base function used to define new elements, can be used with a table or with a function
-@tparam ?table|function element_define used to define how the element is draw, using a table is the simplist way of doing this
-@treturn table the new element define that is used to register events to this element
-
-@usage-- Defining an element with a table
-local example_button =
-Gui.element{
-    type = 'button',
-    caption = 'Example Button'
-}
-
-@usage-- Defining an element with a function
-local example_flow_with_button =
-Gui.element(function(event_trigger,parent,...)
-    -- Add the flow the button is in
-    local flow =
-    parent.add{
-        name = 'example_flow',
-        type = 'flow'
-    }
-
-    -- Add the button
-    local element =
-    flow.add{
-        name = event_trigger,
-        type = 'button',
-        caption = 'Example Button'
-    }
-
-    -- Set the style of the button
-    local style = element.style
-    style.height = 25
-    style.width = 100
-
-    -- Return the element
-    return element
-end)
-
-]]
-function Gui.element(element_define)
-    -- Set the metatable to allow access to register events
-    local element = setmetatable({}, Gui._mt_element)
-
-    -- Increment the uid counter
-    local uid = Gui.uid + 1
-    Gui.uid = uid
-    local name = tostring(uid)
-    element.name = name
-    Gui.debug_info[name] = { draw = 'None', style = 'None', events = {} }
-
-    -- Add the defination function
-    if type(element_define) == 'table' then
-        Gui.debug_info[name].draw = element_define
-        element_define.name = name
-        element._draw = function(_,parent)
-            return parent.add(element_define)
-        end
-    else
-        Gui.debug_info[name].draw = 'Function'
-        element._draw = element_define
-    end
-
-    -- Add the define to the base module
-    local file_path = debug.getinfo(2, 'S').source:match('^.+/currently%-playing/(.+)$'):sub(1, -5)
-    Gui.file_paths[name] = file_path
-    Gui.defines[name] = element
-
-    -- Return the element so event handers can be accessed
-    return element
-end
-
---[[-- Extension of Gui.element when using the table method, values applied after the element is drawn
-@tparam ?table|function style_define used to define how the style is applied, using a table is the simplist way of doing this
-@treturn table the new element define that is used to register events to this element
-
-@usage-- Setting the height and width of the example button
-local example_button =
-Gui.element{
-    type = 'button',
-    caption = 'Example Button'
-}
-:style{
-    height = 25,
-    width = 100
-}
-
-@usage-- Using a function to set the style
-local example_button =
-Gui.element{
-    type = 'button',
-    caption = 'Example Button'
-}
-:style(function(style,element,...)
-    local player = game.players[element.player_index]
-    style.height = 25
-    style.width = 100
-    style.font_color = player.color
-end)
-
-]]
-function Gui._prototype_element:style(style_define)
-    -- Add the defination function
-    if type(style_define) == 'table' then
-        Gui.debug_info[self.name].style = style_define
-        self._style = function(style)
-            for key,value in pairs(style_define) do
-                style[key] = value
-            end
-        end
-    else
-        Gui.debug_info[self.name].style = 'Function'
-        self._style = style_define
-    end
-
-    -- Return the element so event handers can be accessed
-    return self
-end
-
---[[-- Adds an element to be drawn to the top flow when a player joins
-@tparam[opt] function authenticator called during toggle or update to decide if the element should be visible
-@treturn table the new element define that is used to register events to this element
-
-@usage-- Adding the example button
-example_button:add_to_top_flow(function(player)
-    -- example button will only show when game time is less than 1 minute
-    return player.online_time < 3600
-end)
-
-]]
-function Gui._prototype_element:add_to_top_flow(authenticator)
-    Gui.top_elements[self.name] = authenticator or true
-    return self
-end
-
---[[-- Adds an element to be drawn to the left flow when a player joins
-@tparam[opt] ?boolean|function open_on_join called during first darw to decide if the element is visible
-@treturn table the new element define that is used to register events to this element
-
-@usage-- Adding the example button
-example_flow_with_button:add_to_left_flow(true)
-
-]]
-function Gui._prototype_element:add_to_left_flow(open_on_join)
-    Gui.left_elements[self.name] = open_on_join or false
-    return self
-end
-
--- This function is called for event event
-local function general_event_handler(event)
-    -- Check the element is valid
-    local element = event.element
-    if not element or not element.valid then
-        return
-    end
-
-    -- Get the event handler for this element
-    local handlers = Gui.defines[element.name]
-    local handler = handlers and handlers[event.name]
-    if not handler then
-        return
-    end
-
-    -- Get the player for this event
-    local player = game.players[event.player_index]
-    if not player or not player.valid then
-        return
-    end
-    event.player = player
-
-    local success, err = pcall(handler,player,element,event)
-    if not success then
-        error('There as been an error with an event handler for a gui element:\n\t'..err)
-    end
-end
-
--- This function returns the event handler adder and registeres the general handler
-local function event_handler_factory(event_name)
-    Event.add(event_name, general_event_handler)
-
-    return function(self,handler)
-        table.insert(Gui.debug_info[self.name].events,debug.getinfo(1, "n").name)
-        self[event_name] = handler
-        return self
-    end
-end
-
---- Element Events.
--- @section elementEvents
-
---- Called when the player opens a GUI.
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_opened = event_handler_factory(defines.events.on_gui_opened)
-
---- Called when the player closes the GUI they have open.
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_closed = event_handler_factory(defines.events.on_gui_closed)
-
---- Called when LuaGuiElement is clicked.
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_click = event_handler_factory(defines.events.on_gui_click)
-
---- Called when a LuaGuiElement is confirmed, for example by pressing Enter in a textfield.
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_confirmed = event_handler_factory(defines.events.on_gui_confirmed)
-
---- Called when LuaGuiElement checked state is changed (related to checkboxes and radio buttons).
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_checked_changed = event_handler_factory(defines.events.on_gui_checked_state_changed)
-
---- Called when LuaGuiElement element value is changed (related to choose element buttons).
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_elem_changed = event_handler_factory(defines.events.on_gui_elem_changed)
-
---- Called when LuaGuiElement element location is changed (related to frames in player.gui.screen).
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_location_changed = event_handler_factory(defines.events.on_gui_location_changed)
-
---- Called when LuaGuiElement selected tab is changed (related to tabbed-panes).
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_tab_changed = event_handler_factory(defines.events.on_gui_selected_tab_changed)
-
---- Called when LuaGuiElement selection state is changed (related to drop-downs and listboxes).
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_selection_changed = event_handler_factory(defines.events.on_gui_selection_state_changed)
-
---- Called when LuaGuiElement switch state is changed (related to switches).
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_switch_changed = event_handler_factory(defines.events.on_gui_switch_state_changed)
-
---- Called when LuaGuiElement text is changed by the player.
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_text_changed = event_handler_factory(defines.events.on_gui_text_changed)
-
---- Called when LuaGuiElement slider value is changed (related to the slider element).
--- @tparam function handler the event handler which will be called
-Gui._prototype_element.on_value_changed = event_handler_factory(defines.events.on_gui_value_changed)
-
---- Top Flow.
--- @section topFlow
-
---- The style that should be used for buttons on the top flow
--- @field Gui.top_flow_button_style
-Gui.top_flow_button_style = mod_gui.button_style
-
---[[-- Gets the flow which contains the elements for the top flow
-@function Gui.get_top_flow(player)
-@tparam LuaPlayer player the player that you want to get the flow for
-@treturn LuaGuiElement the top element flow
-
-@usage-- Geting your top element flow
-local top_flow = Gui.get_top_flow(game.player)
-
-]]
-Gui.get_top_flow = mod_gui.get_button_flow
-
---- Button which toggles the top flow elements, shows inside top flow
--- @element hide_top_flow
-local hide_top_flow =
-Gui.element{
-    type = 'sprite-button',
-    sprite = 'utility/preset',
-    style = 'tool_button',
-    tooltip = {'gui_util.button_tooltip'}
-}
-:style{
-    padding = -2,
-    width = 18,
-    height = 36
-}
-:on_click(function(player,_,_)
-    Gui.toggle_top_flow(player)
-end)
-
---- Button which toggles the top flow elements, shows inside left flow
--- @element show_top_flow
-local show_top_flow =
-Gui.element{
-    type = 'sprite-button',
-    sprite = 'utility/preset',
-    style = 'tool_button',
-    tooltip = {'gui_util.button_tooltip'}
-}
-:style{
-    padding = -2,
-    width = 18,
-    height = 20
-}
-:on_click(function(player,_,_)
-    Gui.toggle_top_flow(player)
-end)
-
---[[-- Updates the visible states of all the elements on a players top flow
-@tparam LuaPlayer player the player that you want to update the flow for
-
-@usage-- Update your flow
-Gui.update_top_flow(game.player)
-
-]]
-function Gui.update_top_flow(player)
-    local top_flow = Gui.get_top_flow(player)
-    local hide_button = top_flow[hide_top_flow.name]
-    local is_visible = hide_button.visible
-
-    -- Set the visible state of all elements in the flow
-    for name,authenticator in pairs(Gui.top_elements) do
-        -- Ensure the element exists
-        local element = top_flow[name]
-        if not element then
-            element = Gui.defines[name](top_flow)
-        end
-
-        -- Set the visible state
-        element.visible = is_visible and authenticator(player) or false
-    end
-end
-
---[[-- Toggles the visible states of all the elements on a players top flow
-@tparam LuaPlayer player the player that you want to toggle the flow for
-@tparam[opt] boolean state if given then the state will be set to this state
-@treturn boolean the new visible state of the top flow
-
-@usage-- Toggle your flow
-Gui.toggle_top_flow(game.player)
-
-@usage-- Open your top flow
-Gui.toggle_top_flow(game.player,true)
-
-]]
-function Gui.toggle_top_flow(player,state)
-    -- Get the top flow and hide button
-    local top_flow = Gui.get_top_flow(player)
-    if state == nil then state = not top_flow.visible end
-
-    -- Change the visiblty of the flow
-    local left_flow = Gui.get_left_flow(player)
-    local show_button = left_flow.gui_core_buttons[show_top_flow.name]
-    show_button.visible = not state
-    top_flow.visible = state
-
-    return state
-end
-
---- Left Flow.
--- @section leftFlow
-
---[[-- Gets the flow which contains the elements for the left flow
-@function Gui.get_left_flow(player)
-@tparam LuaPlayer player the player that you want to get the flow for
-@treturn LuaGuiElement the left element flow
-
-@usage-- Geting your left element flow
-local left_flow = Gui.get_left_flow(game.player)
-
-]]
-Gui.get_left_flow = mod_gui.get_frame_flow
-
---- Button which hides the elements in the left flow
--- @element hide_left_flow
-local hide_left_flow =
-Gui.element{
-    type = 'sprite-button',
-    sprite = 'utility/close_black',
-    style = 'tool_button',
-    tooltip = {'expcore-gui.left-button-tooltip'}
-}
-:style{
-    padding = -3,
-    width = 18,
-    height = 20
-}
-:on_click(function(player,_,_)
-    Gui.hide_left_flow(player)
-end)
-
---[[-- Button which can be used to toggle a left element, placed on the top flow
-@tparam string sprite the sprite that you want to use on the button
-@tparam ?string|Concepts.LocalizedString tooltip the tooltip that you want the button to have
-@tparam table element_define the element define that you want to be toggled on the left flow
-@tparam[opt] function authenticator used to decide if the button should be visible to a player
-
-@usage-- Add a button to toggle a left element
-local toolbar_button = Gui.left_toolbar_button('entity/inserter','Nothing to see here',example_flow_with_button,function(player)
-    return player.admin
-end)
-
-]]
-function Gui.left_toolbar_button(sprite,tooltip,element_define,authenticator)
-    return Gui.element{
-        type = 'sprite-button',
-        sprite = sprite,
-        tooltip = tooltip,
-        style = Gui.top_flow_button_style
-    }
-    :style{
-        padding = -2
-    }
-    :add_to_top_flow(authenticator)
-    :on_click(function(player,_,_)
-        Gui.toggle_left_element(player, element_define)
-    end)
-end
-
---[[-- Hides all left elements for a player
-@tparam LuaPlayer player the player to hide the elements for
-
-@usage-- Hide your left elements
-Gui.hide_left_flow(game.player)
-
-]]
-function Gui.hide_left_flow(player)
-    local left_flow = Gui.get_left_flow(player)
-    local hide_button = left_flow.gui_core_buttons[hide_left_flow.name]
-
-    -- Set the visible state of all elements in the flow
-    hide_button.visible = false
-    for name,_ in pairs(Gui.left_elements) do
-        left_flow[name].visible = false
-    end
-end
-
---[[-- Get the element define that is in the left flow
-@tparam LuaPlayer player the player that you want tog et the element for
-@tparam table element_define the element that you want to get for the player
-@treturn LuaGuiElement the gui element linked to this define in the left flow
-
-@usage-- Get your left element
-local frame = Gui.get_left_element(game.player,example_flow_with_button)
-
-]]
-function Gui.get_left_element(player,element_define)
-    local left_flow = Gui.get_left_flow(player)
-    return left_flow[element_define.name]
-end
-
---[[-- Toggles the visible state of a left element for a player
-@tparam LuaPlayer player the player that you want to toggle the element for
-@tparam table element_define the element that you want to toggle for the player
-@tparam[opt] boolean state if given then the state will be set to this state
-@treturn boolean the new visible state of the element
-
-@usage-- Toggle your example button
-Gui.toggle_top_flow(game.player,example_flow_with_button)
-
-@usage-- Open your example button
-Gui.toggle_top_flow(game.player,example_flow_with_button,true)
-
-]]
-function Gui.toggle_left_element(player,element_define,state)
-    local left_flow = Gui.get_left_flow(player)
-    local hide_button = left_flow.gui_core_buttons[hide_left_flow.name]
-
-    -- Set the visible state
-    local element = left_flow[element_define.name]
-    if state == nil then state = not element.visible end
-    element.visible = state
-
-    -- Check if the hide button should be visible
-    local show_hide_button = false
-    for name,_ in pairs(Gui.left_elements) do
-        if left_flow[name].visible then
-            show_hide_button = true
-            break
-        end
-    end
-    hide_button.visible = show_hide_button
-
-    return state
-end
-
--- Draw the two flows when a player joins
-Event.add(defines.events.on_player_created,function(event)
-    local player = game.players[event.player_index]
-
-    -- Draw the top flow
-    local top_flow = Gui.get_top_flow(player)
-    hide_top_flow(top_flow)
-    Gui.update_top_flow(player)
-
-    -- Draw the left flow
-    local left_flow = Gui.get_left_flow(player)
-    local button_flow = left_flow.add{ type = 'flow', name = 'gui_core_buttons', direction = 'vertical' }
-    local show_top = show_top_flow(button_flow)
-    local hide_left = hide_left_flow(button_flow)
-    show_top.visible = false
-
-    -- Draw the elements on the left flow
-    local show_hide_left = false
-    for name,open_on_join in pairs(Gui.left_elements) do
-        local left_element = Gui.defines[name](left_flow)
-
-        -- Check if the element should be visible
-        local visible = type(open_on_join) == 'boolean' and open_on_join or false
-        if type(open_on_join) == 'function' then
-            local success, err = pcall(open_on_join, player)
-            if not success then
-                error('There as been an error with an open on join hander for a gui element:\n\t'..err)
-            end
-            visible = err
-        end
-
-        left_element.visible = visible
-        if visible then
-            show_hide_left = true
-        end
-    end
-
-    hide_left.visible = show_hide_left
-end)
-
---- Helper Functions.
--- @section helperFunctions
-
---[[-- Get the player that owns a gui element
-@tparam LuaGuiElement element the element that you want to get the owner of
-@treturn LuaPlayer the player that owns this element
-
-@usage-- Geting the owner of an element
-local player = Gui.get_player_from_element(element)
-
-]]
-function Gui.get_player_from_element(element)
-    if not element or not element.valid then return end
-    return game.players[element.player_index]
-end
-
---[[-- Will toggle the enabled state of an element or set it to the one given
-@tparam LuaGuiElement element the element that you want to toggle the state of
-@tparam[opt] boolean state the state that you want to set
-@treturn boolean the new enabled state that the element has
-
-@usage-- Toggling the the enabled state
-local new_enabled_state = Gui.toggle_enabled_state(element)
-
-]]
-function Gui.toggle_enabled_state(element,state)
-    if not element or not element.valid then return end
-    if state == nil then state = not element.enabled end
-    element.enabled = state
-    return state
-end
-
---[[-- Will toggle the visible state of an element or set it to the one given
-@tparam LuaGuiElement element the element that you want to toggle the state of
-@tparam[opt] boolean state the state that you want to set
-@treturn boolean the new visible state that the element has
-
-@usage-- Toggling the the visible state
-local new_visible_state = Gui.toggle_visible_state(element)
-
-]]
-function Gui.toggle_visible_state(element,state)
-    if not element or not element.valid then return end
-    if state == nil then state = not element.visible end
-    element.visible = state
-    return state
-end
-
---[[-- Destory a gui element without causing any errors, likly if the element may have already been removed
-@tparam LuaGuiElement element the element that you want to remove
-@treturn boolean true if the element was valid and has been removed
-
-@usage-- Likely use case for element not existing
-Gui.destroy_if_valid(element[child_name])
-
-]]
-function Gui.destroy_if_valid(element)
-    if not element or not element.valid then return false end
-    element.destroy()
-    return true
-end
-
---[[-- Returns a table to be used as a style on sprite buttons, produces a sqaure button
-@tparam number size the size that you want the button to be
-@tparam[opt=-2] number padding the padding that you want on the sprite
-@tparam[opt] table style any extra style settings that you want to have
-@treturn table the style table to be used with element_define:style()
-
-@usage-- Adding a sprite button with size 20
-local button =
-Gui.element{
-    type = 'sprite-button',
-    sprite = 'entity/inserter'
-}
-:style(Gui.sprite_style(20))
-
-]]
-function Gui.sprite_style(size,padding,style)
-    style = style or {}
-    style.padding = padding or -2
-    style.height = size
-    style.width = size
-    return style
-end
-
---[[-- Draw a flow that has custom element alignments, default is right align
-@element Gui.alignment
-@tparam LuaGuiElement parent the parent element that the alignment flow will be added to
-@tparam[opt='right'] string horizontal_align the horizontal alignment of the elements in the flow
-@tparam[opt='center'] string vertical_align the vertical alignment of the elements in the flow
-@tparam[opt='alignment'] string name the name of the alignment flow
-@treturn LuaGuiElement the alignment flow that was created
-
-@usage-- Adding a right align flow
-local alignment = Gui.alignment(element,'example_right_alignment')
-
-@usage-- Adding a horizontal center and top align flow
-local alignment = Gui.alignment(element,'example_center_top_alignment','center','top')
-
-]]
-Gui.alignment =
-Gui.element(function(_,parent,_,_,name)
-    return parent.add{
-        name = name or 'alignment',
-        type = 'flow',
-    }
-end)
-:style(function(style,_,horizontal_align,vertical_align,_)
-    style.padding = {1,2}
-    style.vertical_align = vertical_align or 'center'
-    style.horizontal_align = horizontal_align or 'right'
-    style.vertically_stretchable  = style.vertical_align ~= 'center'
-    style.horizontally_stretchable = style.horizontal_align ~= 'center'
-end)
-
---[[-- Draw a scroll pane that has a table inside of it
-@element Gui.scroll_table
-@tparam LuaGuiElement parent the parent element that the scroll table will be added to
-@tparam number height the maximum height for the scroll pane
-@tparam number column_count the number of columns that the table will have
-@tparam[opt='scroll'] string name the name of the scroll pane that is added, the table is always called 'table'
-@treturn LuaGuiElement the table that was created
-
-@usage-- Adding a scroll table with max height of 200 and column count of 3
-local scroll_table = Gui.scroll_table(element,'example_scroll_table',200,3)
-
-]]
-Gui.scroll_table =
-Gui.element(function(_,parent,_,column_count,name)
-    -- Draw the scroll
-    local scroll_pane =
-    parent.add{
-        name = name or 'scroll',
-        type = 'scroll-pane',
-        direction = 'vertical',
-        horizontal_scroll_policy = 'never',
-        vertical_scroll_policy = 'auto',
-        style = 'scroll_pane_under_subheader'
-    }
-
-    -- Draw the table
-    local scroll_table =
-    scroll_pane.add{
-        type = 'table',
-        name = 'table',
-        column_count = column_count
-    }
-
-    -- Return the scroll table
-    return scroll_table
-end)
-:style(function(style,element,height,_,_)
-    -- Change the style of the scroll
-    local scroll_style = element.parent.style
-    scroll_style.padding = {1,3}
-    scroll_style.maximal_height = height
-    scroll_style.horizontally_stretchable = true
-
-    -- Change the style of the table
-    style.padding = 0
-    style.cell_padding = 0
-    style.vertical_align = 'center'
-    style.horizontally_stretchable = true
-end)
-
---[[-- Used to add a header to a frame, this has the option for a custom right alignment flow for buttons
-@element Gui.header
-@tparam LuaGuiElement parent the parent element that the header will be added to
-@tparam ?string|Concepts.LocalizedString caption the caption that will be shown on the header
-@tparam[opt] ?string|Concepts.LocalizedString tooltip the tooltip that will be shown on the header
-@tparam[opt=false] boolean add_alignment when true an alignment flow will be added for buttons
-@tparam[opt='header'] string name the name of the header that is being added, the alignment is always called 'alignment'
-@treturn LuaGuiElement either the header or the header alignment if add_alignment is true
-
-@usage-- Adding a custom header with a label
-local header_alignment = Gui.header(
-    element,
-    'Example Caption',
-    'Example Tooltip',
-    true
-)
-
-]]
-Gui.header =
-Gui.element(function(_,parent,caption,tooltip,add_alignment,name)
-    -- Draw the header
-    local header =
-    parent.add{
-        name = name or 'header',
-        type = 'frame',
-        style = 'subheader_frame'
-    }
-
-    -- Change the style of the header
-    local style = header.style
-    style.padding = {2,4}
-    style.use_header_filler = false
-    style.horizontally_stretchable = true
-
-    -- Draw the caption label
-    if caption then
-        header.add{
-            name = 'header_label',
-            type = 'label',
-            style = 'heading_1_label',
-            caption = caption,
-            tooltip = tooltip
-        }
-    end
-
-    -- Return either the header or the added alignment
-    return add_alignment and Gui.alignment(header) or header
-end)
-
---[[-- Used to add a footer to a frame, this has the option for a custom right alignment flow for buttons
-@element Gui.header
-@tparam LuaGuiElement parent the parent element that the footer will be added to
-@tparam ?string|Concepts.LocalizedString caption the caption that will be shown on the footer
-@tparam[opt] ?string|Concepts.LocalizedString tooltip the tooltip that will be shown on the footer
-@tparam[opt=false] boolean add_alignment when true an alignment flow will be added for buttons
-@tparam[opt='footer'] string name the name of the footer that is being added, the alignment is always called 'alignment'
-@treturn LuaGuiElement either the footer or the footer alignment if add_alignment is true
-
-@usage-- Adding a custom footer with a label
-local header_alignment = Gui.footer(
-    element,
-    'Example Caption',
-    'Example Tooltip',
-    true
-)
-
-]]
-Gui.footer =
-Gui.element(function(_,parent,caption,tooltip,add_alignment,name)
-    -- Draw the header
-    local footer =
-    parent.add{
-        name = name or 'footer',
-        type = 'frame',
-        style = 'subfooter_frame'
-    }
-
-    -- Change the style of the footer
-    local style = footer.style
-    style.padding = {2,4}
-    style.use_header_filler = false
-    style.horizontally_stretchable = true
-
-    -- Draw the caption label
-    if caption then
-        footer.add{
-            name = 'footer_label',
-            type = 'label',
-            style = 'heading_1_label',
-            caption = caption,
-            tooltip = tooltip
-        }
-    end
-
-    -- Return either the footer or the added alignment
-    return add_alignment and Gui.alignment(footer) or footer
-end)
-
---[[-- Used for left frame to add a nice boarder to them and contain them
-@element Gui.container
-@tparam LuaGuiElement parent the parent element that the container will be added to
-@tparam string name the name that you want to give the outer frame, often just event_trigger for a left frame
-@tparam number width the minimal width that the frame will have
-
-@usage-- Adding a container as a base
-local container = Gui.container(parent,'my_container',200)
-
-]]
-Gui.container =
-Gui.element(function(_,parent,name,_)
-    -- Draw the external container
-    local frame =
-    parent.add{
-        name = name,
-        type = 'frame'
-    }
-
-    -- Return the container
-    return frame.add{
-        name = 'container',
-        type = 'frame',
-        direction = 'vertical',
-        style = 'window_content_frame_packed'
-    }
-end)
-:style(function(style,element,_,width)
-    style.vertically_stretchable = false
-    local frame_style = element.parent.style
-    frame_style.padding = 2
-    frame_style.minimal_width = width
-end)
-
--- Module return
-return Gui
\ No newline at end of file
+return require 'expcore.gui.require'
\ No newline at end of file
diff --git a/expcore/gui/core_defines.lua b/expcore/gui/core_defines.lua
new file mode 100644
index 00000000..5c26bea7
--- /dev/null
+++ b/expcore/gui/core_defines.lua
@@ -0,0 +1,87 @@
+--[[-- Core Module - Gui
+- Used to define new gui elements and gui event handlers
+@module Gui
+]]
+
+local Gui = require 'expcore.gui.prototype'
+local Event = require 'utils.event' --- @dep utils.event
+
+--- Core Defines.
+-- @section coreDefines
+
+--- Button which toggles the top flow elements, shows inside top flow
+-- @element hide_top_flow
+local hide_top_flow =
+Gui.element{
+    type = 'sprite-button',
+    sprite = 'utility/preset',
+    style = 'tool_button',
+    tooltip = {'gui_util.button_tooltip'}
+}
+:style{
+    padding = -2,
+    width = 18,
+    height = 36
+}
+:on_click(function(player,_,_)
+    Gui.toggle_top_flow(player)
+end)
+Gui.core_defines.hide_top_flow = hide_top_flow
+
+--- Button which toggles the top flow elements, shows inside left flow
+-- @element show_top_flow
+local show_top_flow =
+Gui.element{
+    type = 'sprite-button',
+    sprite = 'utility/preset',
+    style = 'tool_button',
+    tooltip = {'gui_util.button_tooltip'}
+}
+:style{
+    padding = -2,
+    width = 18,
+    height = 20
+}
+:on_click(function(player,_,_)
+    Gui.toggle_top_flow(player)
+end)
+Gui.core_defines.show_top_flow = show_top_flow
+
+--- Button which hides the elements in the left flow
+-- @element hide_left_flow
+local hide_left_flow =
+Gui.element{
+    type = 'sprite-button',
+    sprite = 'utility/close_black',
+    style = 'tool_button',
+    tooltip = {'expcore-gui.left-button-tooltip'}
+}
+:style{
+    padding = -3,
+    width = 18,
+    height = 20
+}
+:on_click(function(player,_,_)
+    Gui.hide_left_flow(player)
+end)
+Gui.core_defines.hide_left_flow = hide_left_flow
+
+--- Draw the core elements when a player joins the game
+Event.add(defines.events.on_player_created,function(event)
+    local player = game.players[event.player_index]
+
+    -- Draw the top flow
+    local top_flow = Gui.get_top_flow(player)
+    hide_top_flow(top_flow)
+    Gui.update_top_flow(player)
+
+    -- Draw the left flow
+    local left_flow = Gui.get_left_flow(player)
+    local button_flow = left_flow.add{ type = 'flow', name = 'gui_core_buttons', direction = 'vertical' }
+    local show_top = show_top_flow(button_flow)
+    local hide_left = hide_left_flow(button_flow)
+    show_top.visible = false
+    hide_left.visible = false
+    Gui.draw_left_flow(player)
+
+end)
\ No newline at end of file
diff --git a/expcore/gui/defines.lua b/expcore/gui/defines.lua
new file mode 100644
index 00000000..db52d8ca
--- /dev/null
+++ b/expcore/gui/defines.lua
@@ -0,0 +1,218 @@
+--[[-- Core Module - Gui
+- Used to define new gui elements and gui event handlers
+@module Gui
+]]
+
+local Gui = require 'expcore.gui.prototype'
+
+--[[-- Draw a flow that has custom element alignments, default is right align
+@element Gui.alignment
+@tparam LuaGuiElement parent the parent element that the alignment flow will be added to
+@tparam[opt='right'] string horizontal_align the horizontal alignment of the elements in the flow
+@tparam[opt='center'] string vertical_align the vertical alignment of the elements in the flow
+@tparam[opt='alignment'] string name the name of the alignment flow
+@treturn LuaGuiElement the alignment flow that was created
+
+@usage-- Adding a right align flow
+local alignment = Gui.alignment(element,'example_right_alignment')
+
+@usage-- Adding a horizontal center and top align flow
+local alignment = Gui.alignment(element,'example_center_top_alignment','center','top')
+
+]]
+Gui.alignment =
+Gui.element(function(_,parent,_,_,name)
+    return parent.add{
+        name = name or 'alignment',
+        type = 'flow',
+    }
+end)
+:style(function(style,_,horizontal_align,vertical_align,_)
+    style.padding = {1,2}
+    style.vertical_align = vertical_align or 'center'
+    style.horizontal_align = horizontal_align or 'right'
+    style.vertically_stretchable  = style.vertical_align ~= 'center'
+    style.horizontally_stretchable = style.horizontal_align ~= 'center'
+end)
+
+--[[-- Draw a scroll pane that has a table inside of it
+@element Gui.scroll_table
+@tparam LuaGuiElement parent the parent element that the scroll table will be added to
+@tparam number height the maximum height for the scroll pane
+@tparam number column_count the number of columns that the table will have
+@tparam[opt='scroll'] string name the name of the scroll pane that is added, the table is always called 'table'
+@treturn LuaGuiElement the table that was created
+
+@usage-- Adding a scroll table with max height of 200 and column count of 3
+local scroll_table = Gui.scroll_table(element,'example_scroll_table',200,3)
+
+]]
+Gui.scroll_table =
+Gui.element(function(_,parent,_,column_count,name)
+    -- Draw the scroll
+    local scroll_pane =
+    parent.add{
+        name = name or 'scroll',
+        type = 'scroll-pane',
+        direction = 'vertical',
+        horizontal_scroll_policy = 'never',
+        vertical_scroll_policy = 'auto',
+        style = 'scroll_pane_under_subheader'
+    }
+
+    -- Draw the table
+    local scroll_table =
+    scroll_pane.add{
+        type = 'table',
+        name = 'table',
+        column_count = column_count
+    }
+
+    -- Return the scroll table
+    return scroll_table
+end)
+:style(function(style,element,height,_,_)
+    -- Change the style of the scroll
+    local scroll_style = element.parent.style
+    scroll_style.padding = {1,3}
+    scroll_style.maximal_height = height
+    scroll_style.horizontally_stretchable = true
+
+    -- Change the style of the table
+    style.padding = 0
+    style.cell_padding = 0
+    style.vertical_align = 'center'
+    style.horizontally_stretchable = true
+end)
+
+--[[-- Used to add a header to a frame, this has the option for a custom right alignment flow for buttons
+@element Gui.header
+@tparam LuaGuiElement parent the parent element that the header will be added to
+@tparam ?string|Concepts.LocalizedString caption the caption that will be shown on the header
+@tparam[opt] ?string|Concepts.LocalizedString tooltip the tooltip that will be shown on the header
+@tparam[opt=false] boolean add_alignment when true an alignment flow will be added for buttons
+@tparam[opt='header'] string name the name of the header that is being added, the alignment is always called 'alignment'
+@treturn LuaGuiElement either the header or the header alignment if add_alignment is true
+
+@usage-- Adding a custom header with a label
+local header_alignment = Gui.header(
+    element,
+    'Example Caption',
+    'Example Tooltip',
+    true
+)
+
+]]
+Gui.header =
+Gui.element(function(_,parent,caption,tooltip,add_alignment,name)
+    -- Draw the header
+    local header =
+    parent.add{
+        name = name or 'header',
+        type = 'frame',
+        style = 'subheader_frame'
+    }
+
+    -- Change the style of the header
+    local style = header.style
+    style.padding = {2,4}
+    style.use_header_filler = false
+    style.horizontally_stretchable = true
+
+    -- Draw the caption label
+    if caption then
+        header.add{
+            name = 'header_label',
+            type = 'label',
+            style = 'heading_1_label',
+            caption = caption,
+            tooltip = tooltip
+        }
+    end
+
+    -- Return either the header or the added alignment
+    return add_alignment and Gui.alignment(header) or header
+end)
+
+--[[-- Used to add a footer to a frame, this has the option for a custom right alignment flow for buttons
+@element Gui.header
+@tparam LuaGuiElement parent the parent element that the footer will be added to
+@tparam ?string|Concepts.LocalizedString caption the caption that will be shown on the footer
+@tparam[opt] ?string|Concepts.LocalizedString tooltip the tooltip that will be shown on the footer
+@tparam[opt=false] boolean add_alignment when true an alignment flow will be added for buttons
+@tparam[opt='footer'] string name the name of the footer that is being added, the alignment is always called 'alignment'
+@treturn LuaGuiElement either the footer or the footer alignment if add_alignment is true
+
+@usage-- Adding a custom footer with a label
+local header_alignment = Gui.footer(
+    element,
+    'Example Caption',
+    'Example Tooltip',
+    true
+)
+
+]]
+Gui.footer =
+Gui.element(function(_,parent,caption,tooltip,add_alignment,name)
+    -- Draw the header
+    local footer =
+    parent.add{
+        name = name or 'footer',
+        type = 'frame',
+        style = 'subfooter_frame'
+    }
+
+    -- Change the style of the footer
+    local style = footer.style
+    style.padding = {2,4}
+    style.use_header_filler = false
+    style.horizontally_stretchable = true
+
+    -- Draw the caption label
+    if caption then
+        footer.add{
+            name = 'footer_label',
+            type = 'label',
+            style = 'heading_1_label',
+            caption = caption,
+            tooltip = tooltip
+        }
+    end
+
+    -- Return either the footer or the added alignment
+    return add_alignment and Gui.alignment(footer) or footer
+end)
+
+--[[-- Used for left frame to add a nice boarder to them and contain them
+@element Gui.container
+@tparam LuaGuiElement parent the parent element that the container will be added to
+@tparam string name the name that you want to give the outer frame, often just event_trigger for a left frame
+@tparam number width the minimal width that the frame will have
+
+@usage-- Adding a container as a base
+local container = Gui.container(parent,'my_container',200)
+
+]]
+Gui.container =
+Gui.element(function(_,parent,name,_)
+    -- Draw the external container
+    local frame =
+    parent.add{
+        name = name,
+        type = 'frame'
+    }
+
+    -- Return the container
+    return frame.add{
+        name = 'container',
+        type = 'frame',
+        direction = 'vertical',
+        style = 'window_content_frame_packed'
+    }
+end)
+:style(function(style,element,_,width)
+    style.vertically_stretchable = false
+    local frame_style = element.parent.style
+    frame_style.padding = 2
+    frame_style.minimal_width = width
+end)
\ No newline at end of file
diff --git a/expcore/gui/helper_functions.lua b/expcore/gui/helper_functions.lua
new file mode 100644
index 00000000..22106718
--- /dev/null
+++ b/expcore/gui/helper_functions.lua
@@ -0,0 +1,91 @@
+--[[-- Core Module - Gui
+- Used to define new gui elements and gui event handlers
+@module Gui
+]]
+
+local Gui = require 'expcore.gui.prototype'
+
+--- Helper Functions.
+-- @section helperFunctions
+
+--[[-- Get the player that owns a gui element
+@tparam LuaGuiElement element the element that you want to get the owner of
+@treturn LuaPlayer the player that owns this element
+
+@usage-- Geting the owner of an element
+local player = Gui.get_player_from_element(element)
+
+]]
+function Gui.get_player_from_element(element)
+    if not element or not element.valid then return end
+    return game.players[element.player_index]
+end
+
+--[[-- Will toggle the enabled state of an element or set it to the one given
+@tparam LuaGuiElement element the element that you want to toggle the state of
+@tparam[opt] boolean state the state that you want to set
+@treturn boolean the new enabled state that the element has
+
+@usage-- Toggling the the enabled state
+local new_enabled_state = Gui.toggle_enabled_state(element)
+
+]]
+function Gui.toggle_enabled_state(element,state)
+    if not element or not element.valid then return end
+    if state == nil then state = not element.enabled end
+    element.enabled = state
+    return state
+end
+
+--[[-- Will toggle the visible state of an element or set it to the one given
+@tparam LuaGuiElement element the element that you want to toggle the state of
+@tparam[opt] boolean state the state that you want to set
+@treturn boolean the new visible state that the element has
+
+@usage-- Toggling the the visible state
+local new_visible_state = Gui.toggle_visible_state(element)
+
+]]
+function Gui.toggle_visible_state(element,state)
+    if not element or not element.valid then return end
+    if state == nil then state = not element.visible end
+    element.visible = state
+    return state
+end
+
+--[[-- Destory a gui element without causing any errors, likly if the element may have already been removed
+@tparam LuaGuiElement element the element that you want to remove
+@treturn boolean true if the element was valid and has been removed
+
+@usage-- Likely use case for element not existing
+Gui.destroy_if_valid(element[child_name])
+
+]]
+function Gui.destroy_if_valid(element)
+    if not element or not element.valid then return false end
+    element.destroy()
+    return true
+end
+
+--[[-- Returns a table to be used as a style on sprite buttons, produces a sqaure button
+@tparam number size the size that you want the button to be
+@tparam[opt=-2] number padding the padding that you want on the sprite
+@tparam[opt] table style any extra style settings that you want to have
+@treturn table the style table to be used with element_define:style()
+
+@usage-- Adding a sprite button with size 20
+local button =
+Gui.element{
+    type = 'sprite-button',
+    sprite = 'entity/inserter'
+}
+:style(Gui.sprite_style(20))
+
+]]
+function Gui.sprite_style(size,padding,style)
+    style = style or {}
+    style.padding = padding or -2
+    style.height = size
+    style.width = size
+    return style
+end
\ No newline at end of file
diff --git a/expcore/gui/left_flow.lua b/expcore/gui/left_flow.lua
new file mode 100644
index 00000000..e21a10c1
--- /dev/null
+++ b/expcore/gui/left_flow.lua
@@ -0,0 +1,180 @@
+--[[-- Core Module - Gui
+- Used to define new gui elements and gui event handlers
+@module Gui
+]]
+
+local Gui = require 'expcore.gui.prototype'
+local mod_gui = require 'mod-gui' --- @dep mod-gui
+
+local hide_left_flow = Gui.core_defines.hide_left_flow.name
+
+--- Left Flow.
+-- @section leftFlow
+
+--- Contains the uids of the elements that will show on the left flow and the open on join function
+-- @table left_elements
+Gui.left_elements = {}
+
+--[[-- Gets the flow which contains the elements for the left flow
+@function Gui.get_left_flow(player)
+@tparam LuaPlayer player the player that you want to get the flow for
+@treturn LuaGuiElement the left element flow
+
+@usage-- Geting your left element flow
+local left_flow = Gui.get_left_flow(game.player)
+
+]]
+Gui.get_left_flow = mod_gui.get_frame_flow
+
+--[[-- Adds an element to be drawn to the left flow when a player joins
+@tparam[opt] ?boolean|function open_on_join called during first darw to decide if the element is visible
+@treturn table the new element define that is used to register events to this element
+
+@usage-- Adding the example button
+example_flow_with_button:add_to_left_flow(true)
+
+]]
+function Gui._prototype_element:add_to_left_flow(open_on_join)
+    Gui.left_elements[self.name] = open_on_join or false
+    return self
+end
+
+--[[-- Button which can be used to toggle a left element, placed on the top flow
+@tparam string sprite the sprite that you want to use on the button
+@tparam ?string|Concepts.LocalizedString tooltip the tooltip that you want the button to have
+@tparam table element_define the element define that you want to be toggled on the left flow
+@tparam[opt] function authenticator used to decide if the button should be visible to a player
+
+@usage-- Add a button to toggle a left element
+local toolbar_button = Gui.left_toolbar_button('entity/inserter','Nothing to see here',example_flow_with_button,function(player)
+    return player.admin
+end)
+
+]]
+function Gui.left_toolbar_button(sprite,tooltip,element_define,authenticator)
+    return Gui.element{
+        type = 'sprite-button',
+        sprite = sprite,
+        tooltip = tooltip,
+        style = Gui.top_flow_button_style
+    }
+    :style{
+        padding = -2
+    }
+    :add_to_top_flow(authenticator)
+    :on_click(function(player,_,_)
+        Gui.toggle_left_element(player, element_define)
+    end)
+end
+
+--[[-- Draw all the left elements onto the left flow, internal use only
+@tparam LuaPlayer player the player that you want to draw the elements for
+
+@usage Draw all the left elements
+Gui.draw_left_flow(player)
+
+]]
+function Gui.draw_left_flow(player)
+    local left_flow = Gui.get_left_flow(player)
+    local hide_button = left_flow.gui_core_buttons[hide_left_flow]
+    local show_hide_button = false
+
+    for name, open_on_join in pairs(Gui.left_elements) do
+        -- Draw the element to the left flow
+        local left_element = Gui.defines[name](left_flow)
+
+        -- Check if it should be open by default
+        local visible = type(open_on_join) == 'boolean' and open_on_join or false
+        if type(open_on_join) == 'function' then
+            local success, err = pcall(open_on_join, player)
+            if not success then
+                error('There as been an error with an open on join hander for a gui element:\n\t'..err)
+            end
+            visible = err
+        end
+
+        -- Set the visible state of the element
+        left_element.visible = visible
+        show_hide_button = show_hide_button or visible
+    end
+
+    hide_button.visible = show_hide_button
+end
+
+--[[-- Update the visible state of the hide left button, also draw left elements if not present
+@tparam LuaPlayer player the player to update the left flow for
+@treturn boolean true if any left element is visible
+
+@usage Check if any left elements are visible
+local visible = Gui.update_left_flow(player)
+
+]]
+function Gui.update_left_flow(player)
+    local left_flow = Gui.get_left_flow(player)
+    local hide_button = left_flow.gui_core_buttons[hide_left_flow]
+    for name, _ in pairs(Gui.left_elements) do
+        local left_element = left_flow[name]
+        if left_element.visible then
+            hide_button.visible = true
+            return true
+        end
+    end
+    return false
+end
+
+--[[-- Hides all left elements for a player
+@tparam LuaPlayer player the player to hide the elements for
+
+@usage-- Hide your left elements
+Gui.hide_left_flow(game.player)
+
+]]
+function Gui.hide_left_flow(player)
+    local left_flow = Gui.get_left_flow(player)
+    local hide_button = left_flow.gui_core_buttons[hide_left_flow]
+
+    -- Set the visible state of all elements in the flow
+    hide_button.visible = false
+    for name,_ in pairs(Gui.left_elements) do
+        left_flow[name].visible = false
+    end
+end
+
+--[[-- Get the element define that is in the left flow
+@tparam LuaPlayer player the player that you want tog et the element for
+@tparam table element_define the element that you want to get for the player
+@treturn LuaGuiElement the gui element linked to this define in the left flow
+
+@usage-- Get your left element
+local frame = Gui.get_left_element(game.player,example_flow_with_button)
+
+]]
+function Gui.get_left_element(player,element_define)
+    local left_flow = Gui.get_left_flow(player)
+    return left_flow[element_define.name]
+end
+
+--[[-- Toggles the visible state of a left element for a player
+@tparam LuaPlayer player the player that you want to toggle the element for
+@tparam table element_define the element that you want to toggle for the player
+@tparam[opt] boolean state if given then the state will be set to this state
+@treturn boolean the new visible state of the element
+
+@usage-- Toggle your example button
+Gui.toggle_top_flow(game.player,example_flow_with_button)
+
+@usage-- Open your example button
+Gui.toggle_top_flow(game.player,example_flow_with_button,true)
+
+]]
+function Gui.toggle_left_element(player,element_define,state)
+    local left_flow = Gui.get_left_flow(player)
+
+    -- Set the visible state
+    local element = left_flow[element_define.name]
+    if state == nil then state = not element.visible end
+    element.visible = state
+    Gui.update_left_flow(player)
+
+    return state
+end
\ No newline at end of file
diff --git a/expcore/gui/prototype.lua b/expcore/gui/prototype.lua
new file mode 100644
index 00000000..75365bd1
--- /dev/null
+++ b/expcore/gui/prototype.lua
@@ -0,0 +1,352 @@
+--[[-- Core Module - Gui
+- Used to define new gui elements and gui event handlers
+@core Gui
+@alias Gui
+
+@usage-- Defining a button that prints the player's name
+local example_button =
+Gui.element{
+    type = 'button',
+    caption = 'Example Button'
+}
+:on_click(function(player,element,event)
+    player.print(player.name)
+end)
+
+@usage-- Defining a button with a custom style
+local example_button =
+Gui.element{
+    type = 'button',
+    caption = 'Example Button'
+}
+:style{
+    height = 25,
+    width = 100
+}
+:on_click(function(player,element,event)
+    player.print(player.name)
+end)
+
+@usage-- Defining a button using a custom function
+local example_flow_with_button =
+Gui.element(function(event_trigger,parent)
+    -- Add the flow the button is in
+    local flow =
+    parent.add{
+        name = 'example_flow',
+        type = 'flow'
+    }
+
+    -- Get the players name
+    local player = game.players[parent.player_index]
+    local player_name = player.name
+
+    -- Add the button
+    local element =
+    flow.add{
+        name = event_trigger,
+        type = 'button',
+        caption = 'Example Button: '..player_name
+    }
+
+    -- Set the style of the button
+    local style = element.style
+    style.height = 25
+    style.width = 100]
+    style.font_color = player.color
+
+    -- Return the element
+    return element
+end)
+:on_click(function(player,element,event)
+    player.print(player.name)
+end)
+
+@usage-- Drawing an element
+local exmple_button_element = example_button(parent)
+local example_flow_with_button = example_flow_with_button(parent)
+
+]]
+
+local Event = require 'utils.event' --- @dep utils.event
+
+local Gui = {
+    --- The current highest uid that is being used, will not increase during runtime
+    -- @field uid
+    uid = 0,
+    --- An index of the element deinfes which are used by the core gui system
+    -- @table core_defines
+    core_defines = {},
+    --- Table of all the elements which have been registed with the draw function and event handlers
+    -- @table defines
+    defines = {},
+    --- Table of all custom events that are used by element defines, used to avoid conflicts
+    -- @table events
+    events = {},
+    --- An index used for debuging to find the file where different elements where registered
+    -- @table file_paths
+    file_paths = {},
+    --- An index used for debuging to show more data on element defines
+    -- @table debug_info
+    debug_info = {},
+    --- The element prototype which is returned from Gui.element
+    -- @table _prototype_element
+    _prototype_element = {},
+    --- The prototype metatable applied to new element defines
+    -- @table _mt_element
+    _mt_element = {
+        __call = function(self,parent,...)
+            local element = self._draw(self.name,parent,...)
+            if self._style then self._style(element.style,element,...) end
+            return element
+        end
+    }
+}
+
+Gui._mt_element.__index = Gui._prototype_element
+
+--- Element Define.
+-- @section elementDefine
+
+--[[-- Base function used to define new elements, can be used with a table or with a function
+@tparam ?table|function element_define used to define how the element is draw, using a table is the simplist way of doing this
+@treturn table the new element define that is used to register events to this element
+
+@usage-- Defining an element with a table
+local example_button =
+Gui.element{
+    type = 'button',
+    caption = 'Example Button'
+}
+
+@usage-- Defining an element with a function
+local example_flow_with_button =
+Gui.element(function(event_trigger,parent,...)
+    -- Add the flow the button is in
+    local flow =
+    parent.add{
+        name = 'example_flow',
+        type = 'flow'
+    }
+
+    -- Add the button
+    local element =
+    flow.add{
+        name = event_trigger,
+        type = 'button',
+        caption = 'Example Button'
+    }
+
+    -- Set the style of the button
+    local style = element.style
+    style.height = 25
+    style.width = 100
+
+    -- Return the element
+    return element
+end)
+
+]]
+function Gui.element(element_define)
+    -- Set the metatable to allow access to register events
+    local element = setmetatable({}, Gui._mt_element)
+
+    -- Increment the uid counter
+    local uid = Gui.uid + 1
+    Gui.uid = uid
+    local name = tostring(uid)
+    element.name = name
+    Gui.debug_info[name] = { draw = 'None', style = 'None', events = {} }
+
+    -- Add the defination function
+    if type(element_define) == 'table' then
+        Gui.debug_info[name].draw = element_define
+        element_define.name = name
+        element._draw = function(_,parent)
+            return parent.add(element_define)
+        end
+    else
+        Gui.debug_info[name].draw = 'Function'
+        element._draw = element_define
+    end
+
+    -- Add the define to the base module
+    local file_path = debug.getinfo(2, 'S').source:match('^.+/currently%-playing/(.+)$'):sub(1, -5)
+    Gui.file_paths[name] = file_path
+    Gui.defines[name] = element
+
+    -- Return the element so event handers can be accessed
+    return element
+end
+
+--[[-- Extension of Gui.element when using the table method, values applied after the element is drawn
+@tparam ?table|function style_define used to define how the style is applied, using a table is the simplist way of doing this
+@treturn table the new element define that is used to register events to this element
+
+@usage-- Setting the height and width of the example button
+local example_button =
+Gui.element{
+    type = 'button',
+    caption = 'Example Button'
+}
+:style{
+    height = 25,
+    width = 100
+}
+
+@usage-- Using a function to set the style
+local example_button =
+Gui.element{
+    type = 'button',
+    caption = 'Example Button'
+}
+:style(function(style,element,...)
+    local player = game.players[element.player_index]
+    style.height = 25
+    style.width = 100
+    style.font_color = player.color
+end)
+
+]]
+function Gui._prototype_element:style(style_define)
+    -- Add the defination function
+    if type(style_define) == 'table' then
+        Gui.debug_info[self.name].style = style_define
+        self._style = function(style)
+            for key,value in pairs(style_define) do
+                style[key] = value
+            end
+        end
+    else
+        Gui.debug_info[self.name].style = 'Function'
+        self._style = style_define
+    end
+
+    -- Return the element so event handers can be accessed
+    return self
+end
+
+--[[-- Set the handler to be called on a custom event, only one handler can be used
+@tparam string event_name the name of the event you want to handler to be called on
+@tparam function handler the handler that you want to be called when the event is raised
+@treturn table the element define so more handleres can be registered
+
+@usage Print the player name when my_custom_event is raised
+element_deinfe:on_custom_event('my_custom_event', function(event)
+    event.player.print(player.name)
+end)
+
+]]
+function Gui._prototype_element:on_custom_event(event_name,handler)
+    table.insert(Gui.debug_info[self.name].events,event_name)
+    Gui.events[event_name] = event_name
+    self[event_name] = handler
+    return self
+end
+
+--[[-- Raise the handler which is attached to any event; external use should be limited to custom events
+@tparam table event the event table bassed to the handler, must include fields: name, element
+
+@usage Raising a custom event
+element_define:raise_custom_event{
+    name = 'my_custom_event',
+    element = element
+}
+
+]]
+function Gui._prototype_element:raise_custom_event(event)
+    -- Check the element is valid
+    local element = event.element
+    if not element or not element.valid then
+        return
+    end
+
+    -- Get the event handler for this element
+    local handler = self[event.name]
+    if not handler then
+        return
+    end
+
+    -- Get the player for this event
+    local player_index = event.player_index or element.player_index
+    local player = game.players[player_index]
+    if not player or not player.valid then
+        return
+    end
+    event.player = player
+
+    local success, err = pcall(handler,player,element,event)
+    if not success then
+        error('There as been an error with an event handler for a gui element:\n\t'..err)
+    end
+end
+
+-- This function is used to register a link between element define events and the events in the factorio api
+local function event_handler_factory(event_name)
+    Event.add(event_name, function(event)
+        local element = event.element
+        if not element or not element.valid then return end
+        local element_define = Gui.defines[element.name]
+        element_define:raise_custom_event(event)
+    end)
+
+    return function(self,handler)
+        table.insert(Gui.debug_info[self.name].events,debug.getinfo(1, "n").name)
+        self[event_name] = handler
+        return self
+    end
+end
+
+--- Element Events.
+-- @section elementEvents
+
+--- Called when the player opens a GUI.
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_opened = event_handler_factory(defines.events.on_gui_opened)
+
+--- Called when the player closes the GUI they have open.
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_closed = event_handler_factory(defines.events.on_gui_closed)
+
+--- Called when LuaGuiElement is clicked.
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_click = event_handler_factory(defines.events.on_gui_click)
+
+--- Called when a LuaGuiElement is confirmed, for example by pressing Enter in a textfield.
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_confirmed = event_handler_factory(defines.events.on_gui_confirmed)
+
+--- Called when LuaGuiElement checked state is changed (related to checkboxes and radio buttons).
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_checked_changed = event_handler_factory(defines.events.on_gui_checked_state_changed)
+
+--- Called when LuaGuiElement element value is changed (related to choose element buttons).
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_elem_changed = event_handler_factory(defines.events.on_gui_elem_changed)
+
+--- Called when LuaGuiElement element location is changed (related to frames in player.gui.screen).
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_location_changed = event_handler_factory(defines.events.on_gui_location_changed)
+
+--- Called when LuaGuiElement selected tab is changed (related to tabbed-panes).
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_tab_changed = event_handler_factory(defines.events.on_gui_selected_tab_changed)
+
+--- Called when LuaGuiElement selection state is changed (related to drop-downs and listboxes).
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_selection_changed = event_handler_factory(defines.events.on_gui_selection_state_changed)
+
+--- Called when LuaGuiElement switch state is changed (related to switches).
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_switch_changed = event_handler_factory(defines.events.on_gui_switch_state_changed)
+
+--- Called when LuaGuiElement text is changed by the player.
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_text_changed = event_handler_factory(defines.events.on_gui_text_changed)
+
+--- Called when LuaGuiElement slider value is changed (related to the slider element).
+-- @tparam function handler the event handler which will be called
+Gui._prototype_element.on_value_changed = event_handler_factory(defines.events.on_gui_value_changed)
+
+-- Module return
+return Gui
\ No newline at end of file
diff --git a/expcore/gui/require.lua b/expcore/gui/require.lua
new file mode 100644
index 00000000..26fcf0d6
--- /dev/null
+++ b/expcore/gui/require.lua
@@ -0,0 +1,8 @@
+local Gui = require 'expcore.gui.prototype'
+require 'expcore.gui.core_defines'
+require 'expcore.gui.top_flow'
+require 'expcore.gui.left_flow'
+require 'expcore.gui.helper_functions'
+require 'expcore.gui.defines'
+
+return Gui
\ No newline at end of file
diff --git a/expcore/gui/top_flow.lua b/expcore/gui/top_flow.lua
new file mode 100644
index 00000000..b35eb2b0
--- /dev/null
+++ b/expcore/gui/top_flow.lua
@@ -0,0 +1,99 @@
+--[[-- Core Module - Gui
+- Used to define new gui elements and gui event handlers
+@module Gui
+]]
+
+local Gui = require 'expcore.gui.prototype'
+local mod_gui = require 'mod-gui' --- @dep mod-gui
+
+local hide_top_flow = Gui.core_defines.hide_top_flow.name
+local show_top_flow = Gui.core_defines.show_top_flow.name
+
+--- Top Flow.
+-- @section topFlow
+
+--- Contains the uids of the elements that will show on the top flow and the auth function
+-- @table top_elements
+Gui.top_elements = {}
+
+--- The style that should be used for buttons on the top flow
+-- @field Gui.top_flow_button_style
+Gui.top_flow_button_style = mod_gui.button_style
+
+--[[-- Gets the flow which contains the elements for the top flow
+@function Gui.get_top_flow(player)
+@tparam LuaPlayer player the player that you want to get the flow for
+@treturn LuaGuiElement the top element flow
+
+@usage-- Geting your top element flow
+local top_flow = Gui.get_top_flow(game.player)
+
+]]
+Gui.get_top_flow = mod_gui.get_button_flow
+
+--[[-- Adds an element to be drawn to the top flow when a player joins
+@tparam[opt] function authenticator called during toggle or update to decide if the element should be visible
+@treturn table the new element define that is used to register events to this element
+
+@usage-- Adding the example button
+example_button:add_to_top_flow(function(player)
+    -- example button will only show when game time is less than 1 minute
+    return player.online_time < 3600
+end)
+
+]]
+function Gui._prototype_element:add_to_top_flow(authenticator)
+    Gui.top_elements[self.name] = authenticator or true
+    return self
+end
+
+--[[-- Updates the visible states of all the elements on a players top flow
+@tparam LuaPlayer player the player that you want to update the flow for
+
+@usage-- Update your flow
+Gui.update_top_flow(game.player)
+
+]]
+function Gui.update_top_flow(player)
+    local top_flow = Gui.get_top_flow(player)
+    local hide_button = top_flow[hide_top_flow]
+    local is_visible = hide_button.visible
+
+    -- Set the visible state of all elements in the flow
+    for name,authenticator in pairs(Gui.top_elements) do
+        -- Ensure the element exists
+        local element = top_flow[name]
+        if not element then
+            element = Gui.defines[name](top_flow)
+        end
+
+        -- Set the visible state
+        element.visible = is_visible and authenticator(player) or false
+    end
+end
+
+--[[-- Toggles the visible states of all the elements on a players top flow
+@tparam LuaPlayer player the player that you want to toggle the flow for
+@tparam[opt] boolean state if given then the state will be set to this state
+@treturn boolean the new visible state of the top flow
+
+@usage-- Toggle your flow
+Gui.toggle_top_flow(game.player)
+
+@usage-- Open your top flow
+Gui.toggle_top_flow(game.player,true)
+
+]]
+function Gui.toggle_top_flow(player,state)
+    -- Get the top flow and hide button
+    local top_flow = Gui.get_top_flow(player)
+    if state == nil then state = not top_flow.visible end
+
+    -- Change the visiblty of the flow
+    local left_flow = Gui.get_left_flow(player)
+    local show_button = left_flow.gui_core_buttons[show_top_flow]
+    show_button.visible = not state
+    top_flow.visible = state
+
+    return state
+end
\ No newline at end of file