diff --git a/_resources/esx_boat/.editorconfig b/_resources/esx_boat/.editorconfig
new file mode 100644
index 00000000..9b425256
--- /dev/null
+++ b/_resources/esx_boat/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_size = 4
+indent_style = tab
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
\ No newline at end of file
diff --git a/_resources/esx_boat/LICENSE b/_resources/esx_boat/LICENSE
new file mode 100644
index 00000000..94a9ed02
--- /dev/null
+++ b/_resources/esx_boat/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/_resources/esx_boat/README.md b/_resources/esx_boat/README.md
new file mode 100644
index 00000000..881816ed
--- /dev/null
+++ b/_resources/esx_boat/README.md
@@ -0,0 +1,42 @@
+# esx_boat
+This resource for ESX adds boat shops and boat garages around San Andreas, the island has been populated with boat garages, and comes defaulted with one boat shop.
+
+## Requirements
+- [esx_vehicleshop](https://github.com/ESX-Org/esx_vehicleshop)
+
+## Download & Installation
+
+### Using [fvm](https://github.com/qlaffont/fvm-installer)
+```
+fvm install --save --folder=esx esx-org/esx_boat
+```
+
+### Using Git
+```
+cd resources
+git clone https://github.com/ESX-Org/esx_boat [esx]/esx_boat
+```
+
+### Manually
+- Download https://github.com/ESX-Org/esx_boat/archive/master.zip
+- Put it in the `[esx]` directory
+
+## Installation
+- Import `esx_boat.sql` in your database
+- Add this to your `server.cfg`:
+
+```
+start esx_boat
+```
+
+# Legal
+### License
+esx_boat - Boat shop and garage for ESX
+
+Copyright (C) 2015-2020 Jérémie N'gadi
+
+This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
+
+This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
+
+You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/.
diff --git a/_resources/esx_boat/client/main.lua b/_resources/esx_boat/client/main.lua
new file mode 100644
index 00000000..63eacd3e
--- /dev/null
+++ b/_resources/esx_boat/client/main.lua
@@ -0,0 +1,245 @@
+ESX = nil
+isInShopMenu = false
+local spawnedVehicles = {}
+
+Citizen.CreateThread(function()
+	while ESX == nil do
+		TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
+		Citizen.Wait(0)
+	end
+
+	while not ESX.GetPlayerData().job do
+		Citizen.Wait(10)
+	end
+
+	ESX.PlayerData = ESX.GetPlayerData()
+end)
+
+function OpenBoatShop(shop)
+	isInShopMenu = true
+
+	local playerPed = PlayerPedId()
+	local elements  = {}
+
+	for k,v in ipairs(Config.Vehicles) do
+		table.insert(elements, {
+			label = ('%s - <span style="color:green;">$%s</span>'):format(v.label, ESX.Math.GroupDigits(v.price)),
+			name  = v.label,
+			model = v.model,
+			price = v.price,
+			props = v.props or nil
+		})
+	end
+
+	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_shop', {
+		title    = _U('boat_shop'),
+		align    = 'top-left',
+		elements = elements
+	}, function (data, menu)
+		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_shop_confirm', {
+			title    = _U('boat_shop_confirm', data.current.name, ESX.Math.GroupDigits(data.current.price)),
+			align    = 'top-left',
+			elements = {
+				{label = _U('confirm_no'), value = 'no'},
+				{label = _U('confirm_yes'), value = 'yes'}
+		}}, function (data2, menu2)
+			if data2.current.value == 'yes' then
+				local plate = exports['esx_vehicleshop']:GeneratePlate()
+				local vehicle = GetVehiclePedIsIn(playerPed, false)
+				local props = ESX.Game.GetVehicleProperties(vehicle)
+				props.plate = plate
+
+				ESX.TriggerServerCallback('esx_boat:buyBoat', function(bought)
+					if bought then
+						ESX.ShowNotification(_U('boat_shop_bought', data.current.name, ESX.Math.GroupDigits(data.current.price)))
+
+						DeleteSpawnedVehicles()
+						isInShopMenu = false
+						ESX.UI.Menu.CloseAll()
+
+						CurrentAction    = 'boat_shop'
+						CurrentActionMsg = _U('boat_shop_open')
+
+						FreezeEntityPosition(playerPed, false)
+						SetEntityVisible(playerPed, true)
+						SetEntityCoords(playerPed, shop.Outside.x, shop.Outside.y, shop.Outside.z)
+					else
+						ESX.ShowNotification(_U('boat_shop_nomoney'))
+						menu2.close()
+					end
+				end, props)
+			else
+				menu2.close()
+			end
+		end, function (data2, menu2)
+			menu2.close()
+		end)
+	end, function (data, menu)
+		menu.close()
+		isInShopMenu = false
+		DeleteSpawnedVehicles()
+
+		CurrentAction    = 'boat_shop'
+		CurrentActionMsg = _U('boat_shop_open')
+
+		FreezeEntityPosition(playerPed, false)
+		SetEntityVisible(playerPed, true)
+		SetEntityCoords(playerPed, shop.Outside.x, shop.Outside.y, shop.Outside.z)
+	end, function (data, menu)
+		DeleteSpawnedVehicles()
+
+		ESX.Game.SpawnLocalVehicle(data.current.model, shop.Inside, shop.Inside.w, function (vehicle)
+			table.insert(spawnedVehicles, vehicle)
+			TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
+			FreezeEntityPosition(vehicle, true)
+
+			if data.current.props then
+				ESX.Game.SetVehicleProperties(vehicle, data.current.props)
+			end
+		end)
+	end)
+
+	-- spawn first vehicle
+	DeleteSpawnedVehicles()
+
+	ESX.Game.SpawnLocalVehicle(Config.Vehicles[1].model, shop.Inside, shop.Inside.w, function (vehicle)
+		table.insert(spawnedVehicles, vehicle)
+		TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
+		FreezeEntityPosition(vehicle, true)
+
+		if Config.Vehicles[1].props then
+			ESX.Game.SetVehicleProperties(vehicle, Config.Vehicles[1].props)
+		end
+	end)
+end
+
+function OpenBoatGarage(garage)
+	ESX.TriggerServerCallback('esx_boat:getGarage', function (ownedBoats)
+		if #ownedBoats == 0 then
+			ESX.ShowNotification(_U('garage_noboats'))
+		else
+			-- get all available boats
+			local elements = {}
+			for i=1, #ownedBoats, 1 do
+				ownedBoats[i] = json.decode(ownedBoats[i])
+
+				table.insert(elements, {
+					label = getVehicleLabelFromHash(ownedBoats[i].model),
+					vehicleProps = ownedBoats[i]
+				})
+			end
+
+			ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_garage', {
+				title    = _U('garage'),
+				align    = 'top-left',
+				elements = elements
+			}, function (data, menu)
+				-- make sure the spawn point isn't blocked
+				local playerPed = PlayerPedId()
+				local vehicleProps = data.current.vehicleProps
+
+				if ESX.Game.IsSpawnPointClear(garage.SpawnPoint, 4.0) then
+					TriggerServerEvent('esx_boat:takeOutVehicle', vehicleProps.plate)
+					ESX.ShowNotification(_U('garage_taken'))
+
+					ESX.Game.SpawnVehicle(vehicleProps.model, garage.SpawnPoint, garage.SpawnPoint.w, function(vehicle)
+						TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
+						ESX.Game.SetVehicleProperties(vehicle, vehicleProps)
+					end)
+
+					menu.close()
+				else
+					ESX.ShowNotification(_U('garage_blocked'))
+				end
+			end, function (data, menu)
+				menu.close()
+
+				CurrentAction     = 'garage_out'
+				CurrentActionMsg  = _U('garage_open')
+			end)
+		end
+	end)
+end
+
+function OpenLicenceMenu(shop)
+	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_license', {
+		title    = _U('license_menu'),
+		align    = 'top-left',
+		elements = {
+			{label = _U('license_buy_no'), value = 'no'},
+			{label = _U('license_buy_yes', ESX.Math.GroupDigits(Config.LicensePrice)), value = 'yes'}
+	}}, function (data, menu)
+		if data.current.value == 'yes' then
+			ESX.TriggerServerCallback('esx_boat:buyBoatLicense', function (boughtLicense)
+				if boughtLicense then
+					ESX.ShowNotification(_U('license_bought', ESX.Math.GroupDigits(Config.LicensePrice)))
+					menu.close()
+
+					OpenBoatShop(shop) -- parse current shop
+				else
+					ESX.ShowNotification(_U('license_nomoney'))
+				end
+			end)
+		else
+			CurrentAction    = 'boat_shop'
+			CurrentActionMsg = _U('boat_shop_open')
+			menu.close()
+		end
+	end, function (data, menu)
+		CurrentAction    = 'boat_shop'
+		CurrentActionMsg = _U('boat_shop_open')
+		menu.close()
+	end)
+end
+
+function StoreBoatInGarage(vehicle, teleportCoords)
+	local vehicleProps = ESX.Game.GetVehicleProperties(vehicle)
+
+	ESX.TriggerServerCallback('esx_boat:storeVehicle', function (rowsChanged)
+		if rowsChanged > 0 then
+			ESX.Game.DeleteVehicle(vehicle)
+			ESX.ShowNotification(_U('garage_stored'))
+			local playerPed = PlayerPedId()
+
+			ESX.Game.Teleport(playerPed, teleportCoords, function()
+				SetEntityHeading(playerPed, teleportCoords.w)
+			end)
+		else
+			ESX.ShowNotification(_U('garage_notowner'))
+		end
+	end, vehicleProps.plate)
+end
+
+-- Key controls
+Citizen.CreateThread(function()
+	while true do
+		Citizen.Wait(0)
+
+		if isInShopMenu then
+			DisableControlAction(0, 75, true)  -- Disable exit vehicle
+			DisableControlAction(27, 75, true) -- Disable exit vehicle
+		else
+			Citizen.Wait(500)
+		end
+	end
+end)
+
+function DeleteSpawnedVehicles()
+	while #spawnedVehicles > 0 do
+		local vehicle = spawnedVehicles[1]
+		ESX.Game.DeleteVehicle(vehicle)
+		table.remove(spawnedVehicles, 1)
+	end
+end
+
+function getVehicleLabelFromHash(hash)
+	local model = string.lower(GetDisplayNameFromVehicleModel(hash))
+
+	for i=1, #Config.Vehicles, 1 do
+		if Config.Vehicles[i].model == model then
+			return Config.Vehicles[i].label
+		end
+	end
+
+	return 'Unknown model [' .. model .. ']'
+end
diff --git a/_resources/esx_boat/client/marker.lua b/_resources/esx_boat/client/marker.lua
new file mode 100644
index 00000000..46e18481
--- /dev/null
+++ b/_resources/esx_boat/client/marker.lua
@@ -0,0 +1,198 @@
+local HasAlreadyEnteredMarker = false
+local LastZone                = nil
+
+CurrentAction     = nil
+CurrentActionMsg  = ''
+CurrentActionData = {}
+
+-- Key controls
+Citizen.CreateThread(function()
+	while true do
+		Citizen.Wait(0)
+
+		if CurrentAction then
+			ESX.ShowHelpNotification(CurrentActionMsg)
+
+			if IsControlJustReleased(0, 38) then
+				if CurrentAction == 'boat_shop' then
+					if not Config.LicenseEnable then
+						OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum])
+					else -- check for license
+
+						ESX.TriggerServerCallback('esx_license:checkLicense', function(hasBoatLicense)
+							if hasBoatLicense then
+								OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum])
+							else
+								OpenLicenceMenu(Config.Zones.BoatShops[CurrentActionData.zoneNum])
+							end
+						end, GetPlayerServerId(PlayerId()), 'boat')
+					end
+				elseif CurrentAction == 'garage_out' then
+					OpenBoatGarage(Config.Zones.Garages[CurrentActionData.zoneNum])
+				elseif CurrentAction == 'garage_in' then
+					StoreBoatInGarage(CurrentActionData.vehicle, Config.Zones.Garages[CurrentActionData.zoneNum].StoreTP)
+				end
+
+				CurrentAction = nil
+			end
+		else
+			Citizen.Wait(500)
+		end
+	end
+end)
+
+AddEventHandler('esx_boat:hasEnteredMarker', function(zone, zoneNum)
+	if zone == 'boat_shop' then
+		CurrentAction     = 'boat_shop'
+		CurrentActionMsg  = _U('boat_shop_open')
+		CurrentActionData = { zoneNum = zoneNum }
+	elseif zone == 'garage_out' then
+		CurrentAction     = 'garage_out'
+		CurrentActionMsg  = _U('garage_open')
+		CurrentActionData = { zoneNum = zoneNum }
+	elseif zone == 'garage_in' then
+		local playerPed = PlayerPedId()
+		local coords    = GetEntityCoords(playerPed)
+	
+		if IsPedInAnyVehicle(playerPed, false) then
+			local vehicle = GetVehiclePedIsIn(playerPed, false)
+	
+			if DoesEntityExist(vehicle) and GetPedInVehicleSeat(vehicle, -1) == playerPed then
+				CurrentAction     = 'garage_in'
+				CurrentActionMsg  = _U('garage_store')
+				CurrentActionData = { vehicle = vehicle, zoneNum = zoneNum }
+			end
+		end
+	end
+end)
+
+AddEventHandler('esx_boat:hasExitedMarker', function()
+	if not isInShopMenu then
+		ESX.UI.Menu.CloseAll()
+	end
+
+	CurrentAction = nil
+end)
+
+-- Enter / Exit marker events
+Citizen.CreateThread(function()
+	while true do
+		Citizen.Wait(0)
+
+		local playerPed = PlayerPedId()
+		local coords = GetEntityCoords(playerPed)
+		local isInMarker, hasExited, letSleep = false, false, true
+		local currentZone, currentZoneNum
+
+		for i=1, #Config.Zones.BoatShops, 1 do
+			local distance = GetDistanceBetweenCoords(coords, Config.Zones.BoatShops[i].Outside, true)
+
+			if distance < Config.DrawDistance then
+				DrawMarker(Config.MarkerType, Config.Zones.BoatShops[i].Outside, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, nil, nil, false)
+				letSleep = false
+			end
+
+			if distance < Config.Marker.x then
+				isInMarker     = true
+				currentZone    = 'boat_shop'
+				currentZoneNum = i
+			end
+		end
+
+		for i=1, #Config.Zones.Garages, 1 do
+			local distance = GetDistanceBetweenCoords(coords, Config.Zones.Garages[i].GaragePos, true)
+
+			if distance < Config.DrawDistance then
+				DrawMarker(Config.MarkerType, Config.Zones.Garages[i].GaragePos, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, nil, nil, false)
+				letSleep = false
+			end
+
+			if distance < Config.Marker.x then
+				isInMarker     = true
+				currentZone    = 'garage_out'
+				currentZoneNum = i
+			end
+
+			distance = GetDistanceBetweenCoords(coords, Config.Zones.Garages[i].StorePos, true)
+
+			if distance < Config.DrawDistance then
+				DrawMarker(Config.MarkerType, Config.Zones.Garages[i].StorePos, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.StoreMarker.x, Config.StoreMarker.y, Config.StoreMarker.z, Config.StoreMarker.r, Config.StoreMarker.g, Config.StoreMarker.b, 100, false, true, 2, false, nil, nil, false)
+				letSleep = false
+			end
+
+			if distance < Config.StoreMarker.x then
+				isInMarker     = true
+				currentZone    = 'garage_in'
+				currentZoneNum = i
+			end
+		end
+
+		if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastZone ~= currentZone or LastZoneNum ~= currentZoneNum)) then
+			if
+				(LastZone ~= nil and LastZoneNum ~= nil) and
+				(LastZone ~= currentZone or LastZoneNum ~= currentZoneNum)
+			then
+				TriggerEvent('esx_boat:hasExitedMarker', LastZone)
+				hasExited = true
+			end
+
+			HasAlreadyEnteredMarker = true
+			LastZone = currentZone
+			LastZoneNum = currentZoneNum
+
+			TriggerEvent('esx_boat:hasEnteredMarker', currentZone, currentZoneNum)
+		end
+
+		if not hasExited and not isInMarker and HasAlreadyEnteredMarker then
+			HasAlreadyEnteredMarker = false
+			TriggerEvent('esx_boat:hasExitedMarker')
+		end
+
+		if letSleep then
+			Citizen.Wait(500)
+		end
+	end
+end)
+
+-- Blips
+Citizen.CreateThread(function()
+	local blipList = {}
+
+	for i=1, #Config.Zones.Garages, 1 do
+		table.insert(blipList, {
+			coords = Config.Zones.Garages[i].GaragePos,
+			text   = _U('blip_garage'),
+			sprite = 356,
+			color  = 3,
+			scale  = 1.0
+		})
+	end
+
+	for i=1, #Config.Zones.BoatShops, 1 do
+		table.insert(blipList, {
+			coords = Config.Zones.BoatShops[i].Outside,
+			text   = _U('blip_shop'),
+			sprite = 427,
+			color  = 3,
+			scale  = 1.0
+		})
+	end
+
+	for i=1, #blipList, 1 do
+		CreateBlip(blipList[i].coords, blipList[i].text, blipList[i].sprite, blipList[i].color, blipList[i].scale)
+	end
+end)
+
+function CreateBlip(coords, text, sprite, color, scale)
+	local blip = AddBlipForCoord(coords.x, coords.y)
+
+	SetBlipSprite(blip, sprite)
+	SetBlipScale(blip, scale)
+	SetBlipColour(blip, color)
+
+	SetBlipAsShortRange(blip, true)
+
+	BeginTextCommandSetBlipName('STRING')
+	AddTextComponentSubstringPlayerName(text)
+	EndTextCommandSetBlipName(blip)
+end
diff --git a/_resources/esx_boat/config.lua b/_resources/esx_boat/config.lua
new file mode 100644
index 00000000..1577e976
--- /dev/null
+++ b/_resources/esx_boat/config.lua
@@ -0,0 +1,88 @@
+Config               = {}
+
+Config.Locale        = 'en'
+
+Config.LicenseEnable = true -- enable boat license? Requires esx_license
+Config.LicensePrice  = 50000
+
+Config.MarkerType    = 1
+Config.DrawDistance  = 100.0
+
+Config.Marker = {
+	r = 100, g = 204, b = 100, -- blue-ish color
+	x = 1.5, y = 1.5, z = 1.0  -- standard size circle
+}
+
+Config.StoreMarker = {
+	r = 255, g = 0, b = 0,     -- red color
+	x = 5.0, y = 5.0, z = 1.0  -- big circle for storing boat
+}
+
+Config.Zones = {
+
+	Garages = {
+		{ -- Shank St, nearby campaign boat garage
+			GaragePos  = vector3(-772.4, -1430.9, 0.5),
+			SpawnPoint = vector4(-785.39, -1426.3, 0.0, 146.0),
+			StorePos   = vector3(-798.4, -1456.0, 0.0),
+			StoreTP    = vector4(-791.4, -1452.5, 1.5, 318.9)
+		},
+
+		{ -- Catfish View
+			GaragePos  = vector3(3864.9, 4463.9, 1.6),
+			SpawnPoint = vector4(3854.4, 4477.2, 0.0, 273.0),
+			StorePos   = vector3(3857.0, 4446.9, 0.0),
+			StoreTP    = vector4(3854.7, 4458.6, 1.8, 355.3)
+		},
+
+		{ -- Great Ocean Highway
+			GaragePos  = vector3(-1614.0, 5260.1, 2.8),
+			SpawnPoint = vector4(-1622.5, 5247.1, 0.0, 21.0),
+			StorePos   = vector3(-1600.3, 5261.9, 0.0),
+			StoreTP    = vector4(-1605.7, 5259.0, 2.0, 25.0)
+		},
+
+		{ -- North Calafia Way
+			GaragePos  = vector3(712.6, 4093.3, 33.7),
+			SpawnPoint = vector4(712.8, 4080.2, 29.3, 181.0),
+			StorePos   = vector3(705.1, 4110.1, 30.2),
+			StoreTP    = vector4(711.9, 4110.5, 31.3, 180.0)
+		},
+
+		{ -- Elysian Fields, nearby the airport
+			GaragePos  = vector3(23.8, -2806.8, 4.8),
+			SpawnPoint = vector4(23.3, -2828.6, 0.8, 181.0),
+			StorePos   = vector3(-1.0, -2799.2, 0.5),
+			StoreTP    = vector4(12.6, -2793.8, 2.5, 355.2)
+		},
+
+		{ -- Barbareno Rd
+			GaragePos  = vector3(-3427.3, 956.9, 7.3),
+			SpawnPoint = vector4(-3448.9, 953.8, 0.0, 75.0),
+			StorePos   = vector3(-3436.5, 946.6, 0.3),
+			StoreTP    = vector4(-3427.0, 952.6, 8.3, 0.0)
+		}
+	},
+
+	BoatShops = {
+		{ -- Shank St, nearby campaign boat garage
+			Outside = vector3(-773.7, -1495.2, 1.6),
+			Inside = vector4(-798.5, -1503.1, -0.4, 120.0)
+		}
+	}
+
+}
+
+Config.Vehicles = {
+	{model = 'seashark', label = 'Seashark (Random Color)', price = 7500},
+	{model = 'seashark3', label = 'Seashark (Dark Blue)', price = 7500},
+	{model = 'suntrap', label = 'Suntrap', price = 10000},
+	{model = 'jetmax', label = 'Jetmax', price = 45000},
+	{model = 'tropic2', label = 'Tropic', price = 65000},
+	{model = 'dinghy2', label = 'Dinghy (Black)', price = 32500},
+	{model = 'dinghy', label = 'Dinghy 2 (Random Color)', price = 40000},
+	{model = 'speeder', label = 'Speeder', price = 85000},
+	{model = 'squalo', label = 'Squalo (Random Color)', price = 61000},
+	{model = 'toro', label = 'Toro', price = 200000},
+	{model = 'submersible', label = 'Submersible', price = 750000}
+}
\ No newline at end of file
diff --git a/_resources/esx_boat/esx_boat.sql b/_resources/esx_boat/esx_boat.sql
new file mode 100644
index 00000000..901d7cad
--- /dev/null
+++ b/_resources/esx_boat/esx_boat.sql
@@ -0,0 +1,5 @@
+USE `es_extended`;
+
+INSERT INTO `licenses` (`type`, `label`) VALUES
+	('boat', 'Boat License')
+;
\ No newline at end of file
diff --git a/_resources/esx_boat/fxmanifest.lua b/_resources/esx_boat/fxmanifest.lua
new file mode 100644
index 00000000..8e613ee4
--- /dev/null
+++ b/_resources/esx_boat/fxmanifest.lua
@@ -0,0 +1,36 @@
+fx_version 'adamant'
+
+game 'gta5'
+
+description 'ESX Boat'
+
+version '1.0.0'
+
+server_scripts {
+	'@mysql-async/lib/MySQL.lua',
+	'@es_extended/locale.lua',
+	'locales/en.lua',
+	'locales/fr.lua',
+	'locales/sv.lua',
+	'locales/pl.lua',
+  	'locales/es.lua',
+	'config.lua',
+	'server/main.lua'
+}
+
+client_scripts {
+	'@es_extended/locale.lua',
+	'locales/en.lua',
+	'locales/fr.lua',
+	'locales/sv.lua',
+	'locales/pl.lua',
+ 	'locales/es.lua',
+	'config.lua',
+	'client/main.lua',
+	'client/marker.lua'
+}
+
+dependencies {
+	'es_extended',
+	'esx_vehicleshop'
+}
diff --git a/_resources/esx_boat/locales/en.lua b/_resources/esx_boat/locales/en.lua
new file mode 100644
index 00000000..0c981825
--- /dev/null
+++ b/_resources/esx_boat/locales/en.lua
@@ -0,0 +1,31 @@
+Locales['en'] = {
+  -- shop
+  ['boat_shop'] = 'boat shop',
+  ['boat_shop_open'] = 'press ~INPUT_CONTEXT~ to access the ~y~boat shop~s~.',
+  ['boat_shop_confirm'] = 'buy <span style="color: yellow;">%s</span> for <span style="color: orange;">$%s</span>?',
+  ['boat_shop_bought'] = 'you have ~y~bought~s~ a ~b~%s~s~ for ~g~$%s~s~',
+  ['boat_shop_nomoney'] = 'you cannot ~r~afford~s~ this boat!',
+  ['confirm_no'] = 'no',
+  ['confirm_yes'] = 'yes',
+
+  -- garage
+  ['garage'] = 'boat garage',
+  ['garage_open'] = 'press ~INPUT_CONTEXT~ to access your ~y~boat garage~s~.',
+  ['garage_store'] = 'press ~INPUT_CONTEXT~ to ~y~store~s~ the boat in your garage.',
+  ['garage_taken'] = 'the boat has been taken out!',
+  ['garage_stored'] = 'the boat has been safely stored in your garage!',
+  ['garage_noboats'] = 'you don\'t have any stored boats! Visit the ~y~boat shop~s~ to buy one.',
+  ['garage_blocked'] = 'the boat cannot be taken out because another vehicle is blocking the spawn point!',
+  ['garage_notowner'] = 'you don\'t own this boat!',
+
+  -- license
+  ['license_menu'] = 'buy Boat License?',
+  ['license_buy_no'] = 'no',
+  ['license_buy_yes'] = 'buy Boat License <span style="color: green;">$%s</span>',
+  ['license_bought'] = 'you have bought the ~y~Boat License~s~ for ~g~$%s~s~',
+  ['license_nomoney'] = 'you cannot ~r~afford~s~ the ~y~Boat License~s~!',
+
+  -- blips
+  ['blip_garage'] = 'boat Garage',
+  ['blip_shop'] = 'boat Shop',
+}
diff --git a/_resources/esx_boat/locales/es.lua b/_resources/esx_boat/locales/es.lua
new file mode 100644
index 00000000..b73336dc
--- /dev/null
+++ b/_resources/esx_boat/locales/es.lua
@@ -0,0 +1,31 @@
+Locales['es'] = {
+  -- shop
+  ['boat_shop'] = 'Tienda de barcos',
+  ['boat_shop_open'] = 'Pulsa ~INPUT_CONTEXT~ para acceder a la ~y~tienda de barcos~s~.',
+  ['boat_shop_confirm'] = '¿Comprar <span style="color: yellow;">%s</span> por <span style="color: orange;">%s$</span>?',
+  ['boat_shop_bought'] = 'Has ~y~comprado~s~ un ~b~%s~s~ por ~g~%s$~s~',
+  ['boat_shop_nomoney'] = '¡No puedes ~r~permitirte~s~ ese barco!',
+  ['confirm_no'] = 'No',
+  ['confirm_yes'] = 'Si',
+
+  -- garage
+  ['garage'] = 'Garaje de barcos',
+  ['garage_open'] = 'Pulsa ~INPUT_CONTEXT~ para acceder a tu ~y~garaje de barcos~s~',
+  ['garage_store'] = 'Pulsa ~INPUT_CONTEXT~ para ~y~almacenar~s~ el barco en el garaje',
+  ['garage_taken'] = '¡El barco ha sido sacado!',
+  ['garage_stored'] = '¡El barco se ha almacenado en el garaje!',
+  ['garage_noboats'] = '¡No tienes ningún barco guardado! Visita la ~y~tienda de barcos~s~ para comprar uno',
+  ['garage_blocked'] = '¡El barco no ha podido ser sacado, hay un objeto obstruyendo el spawn!',
+  ['garage_notowner'] = '¡No eres el dueño de ese barco!',
+
+  -- license
+  ['license_menu'] = '¿Comprar Licencia de Barcos?',
+  ['license_buy_no'] = 'No',
+  ['license_buy_yes'] = 'Comprar Licencia de Barcos <span style="color: green;">%s$</span>',
+  ['license_bought'] = 'Compraste la ~y~Licencia de Barcos~s~ por ~g~$%s~s~',
+  ['license_nomoney'] = '¡No puedes ~r~permitirte~s~ la ~y~Licencia de Barcos~s~!',
+
+  -- blips
+  ['blip_garage'] = 'Garaje de barcos',
+  ['blip_shop'] = 'Tienda de barcos',
+}
diff --git a/_resources/esx_boat/locales/fr.lua b/_resources/esx_boat/locales/fr.lua
new file mode 100644
index 00000000..c72137a9
--- /dev/null
+++ b/_resources/esx_boat/locales/fr.lua
@@ -0,0 +1,31 @@
+Locales['fr'] = {
+  -- shop
+  ['boat_shop'] = 'magasin de bateaux',
+  ['boat_shop_open'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au ~y~magasin de bateaux~s~.',
+  ['boat_shop_confirm'] = 'voulez-vous acheter <span style="color: yellow;">%s</span> pour <span style="color: orange;">$%s</span>?',
+  ['boat_shop_bought'] = 'vous avez ~y~acheté~s~ le ~b~%s~s~ pour ~g~$%s~s~',
+  ['boat_shop_nomoney'] = 'vous n\'avez pas les moyens ~r~pour acheter~s~ ce bateau !',
+  ['confirm_no'] = 'non',
+  ['confirm_yes'] = 'oui',
+
+  -- garage
+  ['garage'] = 'garage à bateaux',
+  ['garage_open'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder à votre ~y~garage à bateaux~s~.',
+  ['garage_store'] = 'appuyez sur ~INPUT_CONTEXT~ pour ~y~ranger~s~ votre bateau dans votre garage.',
+  ['garage_taken'] = 'le bateau est sorti !',
+  ['garage_stored'] = 'le bateau a bien été rangé dans votre garage !',
+  ['garage_noboats'] = 'vous n\'avez aucun bateau ici ! Rendez-vous au ~y~magasin de bateaux~s~ pour en acheter un.',
+  ['garage_blocked'] = 'le bateau ne peux pas être sorti car un autre véhicule bloque le point !',
+  ['garage_notowner'] = 'ce bateau ne vous appartient pas !',
+
+  -- license
+  ['license_menu'] = 'acheter un permis de naviguer',
+  ['license_buy_no'] = 'non',
+  ['license_buy_yes'] = 'acheter le permis pour <span style="color: green;">$%s</span>',
+  ['license_bought'] = 'vous avez acheté le ~y~permis de naviguer~s~ pour ~g~$%s~s~',
+  ['license_nomoney'] = 'vous n\'avez pas les moyens ~r~pour acheter~s~ ce permis !',
+
+  -- blips
+  ['blip_garage'] = 'garage à bateaux',
+  ['blip_shop'] = 'magasin de bateaux',
+}
diff --git a/_resources/esx_boat/locales/pl.lua b/_resources/esx_boat/locales/pl.lua
new file mode 100644
index 00000000..d09ee011
--- /dev/null
+++ b/_resources/esx_boat/locales/pl.lua
@@ -0,0 +1,31 @@
+Locales['pl'] = {
+  -- shop
+  ['boat_shop'] = 'sklep z łodziami',
+  ['boat_shop_open'] = 'naciśnij ~INPUT_CONTEXT~ aby otworzyć ~y~sklep z łodziami~s~.',
+  ['boat_shop_confirm'] = 'kup <span style="color: yellow;">%s</span> za <span style="color: orange;">$%s</span>?',
+  ['boat_shop_bought'] = '~y~zakupiłeś/aś~s~ ~b~%s~s~ za ~g~$%s~s~',
+  ['boat_shop_nomoney'] = 'nie posiadasz ~r~wystarczająco~s~ pieniędzy aby zakupić te łódź!',
+  ['confirm_no'] = 'nie',
+  ['confirm_yes'] = 'tak',
+
+  -- garage
+  ['garage'] = 'garaż: Lodzie',
+  ['garage_open'] = 'naciśnij ~INPUT_CONTEXT~ aby otworzyć ~y~garaż z łodziami~s~.',
+  ['garage_store'] = 'naciśnij ~INPUT_CONTEXT~ aby ~y~schować~s~ swoją łódź do garażu',
+  ['garage_taken'] = 'łódź zostałą wyjęta z garażu',
+  ['garage_stored'] = 'łódź została schowana do garażu',
+  ['garage_noboats'] = 'nie posiadasz żadnych łodzi!',
+  ['garage_blocked'] = 'łódź nie może zostać wyjęta dlatego że coś blokuje jej miejsce narodzenia',
+  ['garage_notowner'] = 'nie jesteś właścicielem tej łodzi!',
+
+  -- license
+  ['license_menu'] = 'kup licencje na płwanie łodziami?',
+  ['license_buy_no'] = 'nie',
+  ['license_buy_yes'] = 'kup licencje na pływanie łodziami <span style="color: green;">$%s</span>',
+  ['license_bought'] = 'zakupiłeś/aś ~y~licencje na pływanie łodziami~s~ za ~g~$%s~s~',
+  ['license_nomoney'] = 'nie posiadasz  ~r~wystarczająco~s~ pieniędzy aby zakupić ~y~licencje na pływanie łodziami~s~!',
+
+  -- blips
+  ['blip_garage'] = 'garaż: Lodzie',
+  ['blip_shop'] = 'sklep z łodziami',
+}
diff --git a/_resources/esx_boat/locales/sv.lua b/_resources/esx_boat/locales/sv.lua
new file mode 100644
index 00000000..f4f194a5
--- /dev/null
+++ b/_resources/esx_boat/locales/sv.lua
@@ -0,0 +1,31 @@
+Locales['sv'] = {
+  -- shop
+  ['boat_shop'] = 'båtaffär',
+  ['boat_shop_open'] = 'tryck ~INPUT_CONTEXT~ för att öppna ~y~båtaffären~s~.',
+  ['boat_shop_confirm'] = 'köp <span style="color: yellow;">%s</span> för <span style="color: orange;">%s SEK</span>?',
+  ['boat_shop_bought'] = 'du har ~y~köpt~s~ en ~b~%s~s~ för ~g~%s SEK~s~',
+  ['boat_shop_nomoney'] = 'du har ~r~inte råd~s~ för denna båt!',
+  ['confirm_no'] = 'nej',
+  ['confirm_yes'] = 'ja',
+
+  -- garage
+  ['garage'] = 'båtgarage',
+  ['garage_open'] = 'tryck ~INPUT_CONTEXT~ för att öppna ~y~båtgaraget~s~.',
+  ['garage_store'] = 'tryck ~INPUT_CONTEXT~ för att ~y~lagra~s~ båten i ditt garage.',
+  ['garage_taken'] = 'båten har släppts från garaget!',
+  ['garage_stored'] = 'båten har lagrats i garaget!',
+  ['garage_noboats'] = 'du har inga lagrade båtar! Besök ~y~båtaffären~s~ för att köpa båtar.',
+  ['garage_blocked'] = 'båten kan inte tas ur på grund av att en annan båt blokerar spawnpointen!',
+  ['garage_notowner'] = 'du äger inte denna båt!',
+
+  -- license
+  ['license_menu'] = 'köpa båtlicens?',
+  ['license_buy_no'] = 'nej',
+  ['license_buy_yes'] = 'köp båtlicens <span style="color: green;">%s SEK</span>',
+  ['license_bought'] = 'du köpte ~y~båtlicensen~s~ för ~g~%s SEK~s~',
+  ['license_nomoney'] = 'du har ~r~inte råd~s~ för ~y~båtlicensen~s~!',
+
+  -- blips
+  ['blip_garage'] = 'båtgarage',
+  ['blip_shop'] = 'båtaffär',
+}
diff --git a/_resources/esx_boat/localization/es_esx_boat.sql b/_resources/esx_boat/localization/es_esx_boat.sql
new file mode 100644
index 00000000..b0eca82c
--- /dev/null
+++ b/_resources/esx_boat/localization/es_esx_boat.sql
@@ -0,0 +1,5 @@
+USE `es_extended`;
+
+INSERT INTO `licenses` (`type`, `label`) VALUES
+    ('boat', 'Licencia de Barcos')
+;
diff --git a/_resources/esx_boat/server/main.lua b/_resources/esx_boat/server/main.lua
new file mode 100644
index 00000000..94cecd05
--- /dev/null
+++ b/_resources/esx_boat/server/main.lua
@@ -0,0 +1,117 @@
+ESX = nil
+
+TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
+
+MySQL.ready(function()
+	ParkBoats()
+end)
+
+function ParkBoats()
+	MySQL.Async.execute('UPDATE owned_vehicles SET `stored` = true WHERE `stored` = false AND type = @type', {
+		['@type'] = 'boat'
+	}, function (rowsChanged)
+		if rowsChanged > 0 then
+			print(('esx_boat: %s boat(s) have been stored!'):format(rowsChanged))
+		end
+	end)
+end
+
+ESX.RegisterServerCallback('esx_boat:buyBoat', function(source, cb, vehicleProps)
+	local xPlayer = ESX.GetPlayerFromId(source)
+	local price   = getPriceFromModel(vehicleProps.model)
+
+	-- vehicle model not found
+	if price == 0 then
+		print(('esx_boat: %s attempted to exploit the shop! (invalid vehicle model)'):format(xPlayer.identifier))
+		cb(false)
+	else
+		if xPlayer.getMoney() >= price then
+			xPlayer.removeMoney(price)
+
+			MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle, type, `stored`) VALUES (@owner, @plate, @vehicle, @type, @stored)', {
+				['@owner']   = xPlayer.identifier,
+				['@plate']   = vehicleProps.plate,
+				['@vehicle'] = json.encode(vehicleProps),
+				['@type']    = 'boat',
+				['@stored']  = true
+			}, function(rowsChanged)
+				cb(true)
+			end)
+		else
+			cb(false)
+		end
+	end
+end)
+
+RegisterServerEvent('esx_boat:takeOutVehicle')
+AddEventHandler('esx_boat:takeOutVehicle', function(plate)
+	local xPlayer = ESX.GetPlayerFromId(source)
+
+	MySQL.Async.execute('UPDATE owned_vehicles SET `stored` = @stored WHERE owner = @owner AND plate = @plate', {
+		['@stored'] = false,
+		['@owner']  = xPlayer.identifier,
+		['@plate']  = plate
+	}, function(rowsChanged)
+		if rowsChanged == 0 then
+			print(('esx_boat: %s exploited the garage!'):format(xPlayer.identifier))
+		end
+	end)
+end)
+
+ESX.RegisterServerCallback('esx_boat:storeVehicle', function (source, cb, plate)
+	local xPlayer = ESX.GetPlayerFromId(source)
+
+	MySQL.Async.execute('UPDATE owned_vehicles SET `stored` = @stored WHERE owner = @owner AND plate = @plate', {
+		['@stored'] = true,
+		['@owner']  = xPlayer.identifier,
+		['@plate']  = plate
+	}, function(rowsChanged)
+		if rowsChanged == 0 then
+			print(('esx_boat: %s attempted to store an boat they don\'t own!'):format(xPlayer.identifier))
+		end
+
+		cb(rowsChanged)
+	end)
+end)
+
+ESX.RegisterServerCallback('esx_boat:getGarage', function(source, cb)
+	local xPlayer = ESX.GetPlayerFromId(source)
+
+	MySQL.Async.fetchAll('SELECT vehicle FROM owned_vehicles WHERE owner = @owner AND type = @type AND `stored` = @stored', {
+		['@owner']  = xPlayer.identifier,
+		['@type']   = 'boat',
+		['@stored'] = true
+	}, function(result)
+		local vehicles = {}
+
+		for i=1, #result, 1 do
+			table.insert(vehicles, result[i].vehicle)
+		end
+
+		cb(vehicles)
+	end)
+end)
+
+ESX.RegisterServerCallback('esx_boat:buyBoatLicense', function(source, cb)
+	local xPlayer = ESX.GetPlayerFromId(source)
+
+	if xPlayer.getMoney() >= Config.LicensePrice then
+		xPlayer.removeMoney(Config.LicensePrice)
+
+		TriggerEvent('esx_license:addLicense', source, 'boat', function()
+			cb(true)
+		end)
+	else
+		cb(false)
+	end
+end)
+
+function getPriceFromModel(model)
+	for k,v in ipairs(Config.Vehicles) do
+		if GetHashKey(v.model) == model then
+			return v.price
+		end
+	end
+
+	return 0
+end