diff --git a/esx_basicneeds/LICENSE b/esx_basicneeds/LICENSE
new file mode 100644
index 00000000..96cd6a81
--- /dev/null
+++ b/esx_basicneeds/LICENSE
@@ -0,0 +1,682 @@
+                    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.
+
+<<<<<<< HEAD
+    fxserver-esx_status
+=======
+    fxserver-esx_basicneeds
+>>>>>>> esx_basicneeds/master
+    Copyright (C) 2015 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/>.
+
+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:
+
+<<<<<<< HEAD
+    fxserver-esx_status Copyright (C) 2015 Jérémie N'gadi
+=======
+    fxserver-esx_basicneeds Copyright (C) 2015 Jérémie N'gadi
+>>>>>>> esx_basicneeds/master
+    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>.
\ No newline at end of file
diff --git a/esx_basicneeds/README.md b/esx_basicneeds/README.md
new file mode 100644
index 00000000..66a44b74
--- /dev/null
+++ b/esx_basicneeds/README.md
@@ -0,0 +1,83 @@
+<<<<<<< HEAD
+# esx_status
+ESX Status
+[INSTALLATION]
+
+1) CD in your resources/[esx] folder
+2) Clone the repository
+```
+git clone https://github.com/ESX-Org/esx_status esx_status
+```
+3) Import esx_status.sql in your database
+4) Add this in your server.cfg :
+
+```
+start esx_status
+```
+
+[HOWTO]
+
+server.lua
+```lua
+
+local name    = 'hunger'
+local default = 1000000
+local color   = '#CFAD0F'
+
+TriggerEvent('esx_status:registerStatus', name, default, color, 
+	function(status) -- Visible calllback, if it return true the status will be visible
+		return true
+	end,
+	function(status) -- Tick callback, what to do at each tick
+		status.remove(200)
+	end,
+	{remove = 200} -- Client action (add / remove) so the client can be in sync with server
+)
+
+
+```
+=======
+# esx_basicneeds
+This script implements hunger and thirst status, they can be increased when eating bread or drinking water.
+
+## Requirements
+- [esx_status](https://github.com/ESX-Org/esx_status)
+
+## Download & Installation
+
+### Using [fvm](https://github.com/qlaffont/fvm-installer)
+```
+fvm install --save --folder=esx esx-org/esx_basicneeds
+```
+
+### Using Git
+```
+cd resources
+git clone https://github.com/ESX-Org/esx_basicneeds [esx]/esx_basicneeds
+```
+
+### Manually
+- Download https://github.com/ESX-Org/esx_basicneeds/archive/master.zip
+- Put it in the `[esx]` directory
+
+
+## Installation
+- Import `esx_basicneeds.sql` in your database
+- Add this in your server.cfg :
+
+```
+start esx_basicneeds
+```
+
+# Legal
+### License
+esx_basicneeds - thirst and hunger system
+
+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/.
+>>>>>>> esx_basicneeds/master
diff --git a/esx_basicneeds/client/main.lua b/esx_basicneeds/client/main.lua
new file mode 100644
index 00000000..dece3069
--- /dev/null
+++ b/esx_basicneeds/client/main.lua
@@ -0,0 +1,323 @@
+<<<<<<< HEAD
+ESX = nil
+local Status, isPaused = {}, false
+=======
+ESX          = nil
+local IsDead = false
+local IsAnimated = false
+>>>>>>> esx_basicneeds/master
+
+Citizen.CreateThread(function()
+	while ESX == nil do
+		TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
+		Citizen.Wait(0)
+	end
+end)
+
+<<<<<<< HEAD
+function GetStatusData(minimal)
+	local status = {}
+
+	for i=1, #Status, 1 do
+		if minimal then
+			table.insert(status, {
+				name    = Status[i].name,
+				val     = Status[i].val,
+				percent = (Status[i].val / Config.StatusMax) * 100
+			})
+		else
+			table.insert(status, {
+				name    = Status[i].name,
+				val     = Status[i].val,
+				color   = Status[i].color,
+				visible = Status[i].visible(Status[i]),
+				percent = (Status[i].val / Config.StatusMax) * 100
+			})
+		end
+	end
+
+	return status
+end
+
+AddEventHandler('esx_status:registerStatus', function(name, default, color, visible, tickCallback)
+	local status = CreateStatus(name, default, color, visible, tickCallback)
+	table.insert(Status, status)
+end)
+
+AddEventHandler('esx_status:unregisterStatus', function(name)
+	for k,v in ipairs(Status) do
+		if v.name == name then
+			table.remove(Status, k)
+			break
+		end
+	end
+end)
+
+RegisterNetEvent('esx:onPlayerLogout')
+AddEventHandler('esx:onPlayerLogout', function()
+	Status = {}
+	if Config.Display then
+		SendNUIMessage({
+			update = true,
+			status = Status
+		})
+	end
+end)
+
+RegisterNetEvent('esx_status:load')
+AddEventHandler('esx_status:load', function(status)
+	TriggerEvent('esx_status:loaded')
+	for i=1, #Status, 1 do
+		for j=1, #status, 1 do
+			if Status[i].name == status[j].name then
+				Status[i].set(status[j].val)
+			end
+		end
+	end
+
+	if Config.Display then TriggerEvent('esx_status:setDisplay', 0.5) end
+
+	Citizen.CreateThread(function()
+		while #Status > 0 do
+			for i=1, #Status, 1 do
+				Status[i].onTick()
+			end
+			local data = GetStatusData(true)
+			
+			if Config.Display then
+				local fullData = data
+				for i=1, #data, 1 do
+					fullData[i].color = Status[i].color
+					fullData[i].visible = Status[i].visible(Status[i])
+				end
+				SendNUIMessage({
+					update = true,
+					status = fullData
+				})
+			end
+
+			TriggerEvent('esx_status:onTick', data)
+			Citizen.Wait(Config.TickTime)
+		end
+	end)
+end)
+
+RegisterNetEvent('esx_status:set')
+AddEventHandler('esx_status:set', function(name, val)
+	for i=1, #Status, 1 do
+		if Status[i].name == name then
+			Status[i].set(val)
+			break
+		end
+	end
+	if Config.Display then
+		SendNUIMessage({
+			update = true,
+			status = GetStatusData()
+		})
+	end
+end)
+
+RegisterNetEvent('esx_status:add')
+AddEventHandler('esx_status:add', function(name, val)
+	for i=1, #Status, 1 do
+		if Status[i].name == name then
+			Status[i].add(val)
+			break
+		end
+	end
+	if Config.Display then
+		SendNUIMessage({
+			update = true,
+			status = GetStatusData()
+		})
+	end
+end)
+
+RegisterNetEvent('esx_status:remove')
+AddEventHandler('esx_status:remove', function(name, val)
+	for i=1, #Status, 1 do
+		if Status[i].name == name then
+			Status[i].remove(val)
+			break
+		end
+	end
+		if Config.Display then
+		SendNUIMessage({
+			update = true,
+			status = GetStatusData()
+		})
+	end
+end)
+
+AddEventHandler('esx_status:getStatus', function(name, cb)
+	for i=1, #Status, 1 do
+		if Status[i].name == name then
+			cb(Status[i])
+			return
+		end
+	end
+end)
+
+AddEventHandler('esx_status:setDisplay', function(val)
+	SendNUIMessage({
+		setDisplay = true,
+		display    = val
+	})
+end)
+
+-- Pause menu disable hud display
+Citizen.CreateThread(function()
+	while true do
+		if Config.Display then
+			Citizen.Wait(300)
+
+			if IsPauseMenuActive() and not isPaused then
+				isPaused = true
+				TriggerEvent('esx_status:setDisplay', 0.0)
+			elseif not IsPauseMenuActive() and isPaused then
+				isPaused = false 
+				TriggerEvent('esx_status:setDisplay', 0.5)
+			end
+		else Citizen.Wait(1000) end
+	end
+end)
+
+-- Loading screen off event
+AddEventHandler('esx:loadingScreenOff', function()
+	if not isPaused then
+		TriggerEvent('esx_status:setDisplay', 0.3)
+	end
+end)
+
+-- Update server
+Citizen.CreateThread(function()
+	while true do
+		Citizen.Wait(Config.UpdateInterval)
+
+		TriggerServerEvent('esx_status:update', GetStatusData(true))
+=======
+AddEventHandler('esx_basicneeds:resetStatus', function()
+	TriggerEvent('esx_status:set', 'hunger', 500000)
+	TriggerEvent('esx_status:set', 'thirst', 500000)
+end)
+
+RegisterNetEvent('esx_basicneeds:healPlayer')
+AddEventHandler('esx_basicneeds:healPlayer', function()
+	-- restore hunger & thirst
+	TriggerEvent('esx_status:set', 'hunger', 1000000)
+	TriggerEvent('esx_status:set', 'thirst', 1000000)
+
+	-- restore hp
+	local playerPed = PlayerPedId()
+	SetEntityHealth(playerPed, GetEntityMaxHealth(playerPed))
+end)
+
+AddEventHandler('esx:onPlayerDeath', function()
+	IsDead = true
+end)
+
+AddEventHandler('esx:onPlayerSpawn', function(spawn)
+	if IsDead then
+		TriggerEvent('esx_basicneeds:resetStatus')
+	end
+
+	IsDead = false
+end)
+
+AddEventHandler('esx_status:loaded', function(status)
+
+	TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', function(status)
+		return Config.Visible
+	end, function(status)
+		status.remove(100)
+	end)
+
+	TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', function(status)
+		return Config.Visible
+	end, function(status)
+		status.remove(75)
+	end)
+
+end)
+
+AddEventHandler('esx_status:onTick', function(data)
+	local playerPed  = PlayerPedId()
+	local prevHealth = GetEntityHealth(playerPed)
+	local health     = prevHealth
+	
+	for k, v in pairs(data) do
+		if v.name == 'hunger' and v.percent == 0 then
+			if prevHealth <= 150 then
+				health = health - 5
+			else
+				health = health - 1
+			end
+		elseif v.name == 'thirst' and v.percent == 0 then
+			if prevHealth <= 150 then
+				health = health - 5
+			else
+				health = health - 1
+			end
+		end
+	end
+	
+	if health ~= prevHealth then SetEntityHealth(playerPed, health) end
+end)
+
+AddEventHandler('esx_basicneeds:isEating', function(cb)
+	cb(IsAnimated)
+end)
+
+RegisterNetEvent('esx_basicneeds:onEat')
+AddEventHandler('esx_basicneeds:onEat', function(prop_name)
+	if not IsAnimated then
+		prop_name = prop_name or 'prop_cs_burger_01'
+		IsAnimated = true
+
+		Citizen.CreateThread(function()
+			local playerPed = PlayerPedId()
+			local x,y,z = table.unpack(GetEntityCoords(playerPed))
+			local prop = CreateObject(GetHashKey(prop_name), x, y, z + 0.2, true, true, true)
+			local boneIndex = GetPedBoneIndex(playerPed, 18905)
+			AttachEntityToEntity(prop, playerPed, boneIndex, 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true)
+
+			ESX.Streaming.RequestAnimDict('mp_player_inteat@burger', function()
+				TaskPlayAnim(playerPed, 'mp_player_inteat@burger', 'mp_player_int_eat_burger_fp', 8.0, -8, -1, 49, 0, 0, 0, 0)
+
+				Citizen.Wait(3000)
+				IsAnimated = false
+				ClearPedSecondaryTask(playerPed)
+				DeleteObject(prop)
+			end)
+		end)
+
+	end
+end)
+
+RegisterNetEvent('esx_basicneeds:onDrink')
+AddEventHandler('esx_basicneeds:onDrink', function(prop_name)
+	if not IsAnimated then
+		prop_name = prop_name or 'prop_ld_flow_bottle'
+		IsAnimated = true
+
+		Citizen.CreateThread(function()
+			local playerPed = PlayerPedId()
+			local x,y,z = table.unpack(GetEntityCoords(playerPed))
+			local prop = CreateObject(GetHashKey(prop_name), x, y, z + 0.2, true, true, true)
+			local boneIndex = GetPedBoneIndex(playerPed, 18905)
+			AttachEntityToEntity(prop, playerPed, boneIndex, 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true)
+
+			ESX.Streaming.RequestAnimDict('mp_player_intdrink', function()
+				TaskPlayAnim(playerPed, 'mp_player_intdrink', 'loop_bottle', 1.0, -1.0, 2000, 0, 1, true, true, true)
+
+				Citizen.Wait(3000)
+				IsAnimated = false
+				ClearPedSecondaryTask(playerPed)
+				DeleteObject(prop)
+			end)
+		end)
+
+>>>>>>> esx_basicneeds/master
+	end
+end)
diff --git a/esx_basicneeds/config.lua b/esx_basicneeds/config.lua
new file mode 100644
index 00000000..380069c7
--- /dev/null
+++ b/esx_basicneeds/config.lua
@@ -0,0 +1,11 @@
+Config = {}
+<<<<<<< HEAD
+
+Config.StatusMax      = 1000000
+Config.TickTime       = 1000
+Config.UpdateInterval = 10000
+Config.Display        = true	-- Enable the esx_status bars (disable if you are using another HUD)
+=======
+Config.Locale = 'en'
+Config.Visible = true
+>>>>>>> esx_basicneeds/master
diff --git a/esx_basicneeds/esx_basicneeds.sql b/esx_basicneeds/esx_basicneeds.sql
new file mode 100644
index 00000000..dc053c4c
--- /dev/null
+++ b/esx_basicneeds/esx_basicneeds.sql
@@ -0,0 +1,6 @@
+USE `es_extended`;
+
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Bread', 1),
+	('water', 'Water', 1)
+;
diff --git a/esx_basicneeds/fxmanifest.lua b/esx_basicneeds/fxmanifest.lua
new file mode 100644
index 00000000..5abd6884
--- /dev/null
+++ b/esx_basicneeds/fxmanifest.lua
@@ -0,0 +1,67 @@
+fx_version 'adamant'
+
+game 'gta5'
+
+<<<<<<< HEAD
+description 'ESX Status'
+
+version '1.0.0'
+
+server_scripts {
+	'@mysql-async/lib/MySQL.lua',
+	'config.lua',
+	'server/main.lua'
+}
+
+client_scripts {
+	'config.lua',
+	'client/classes/status.lua',
+	'client/main.lua'
+}
+
+ui_page 'html/ui.html'
+
+files {
+	'html/ui.html',
+	'html/css/app.css',
+	'html/scripts/app.js'
+=======
+description 'ESX Basic Needs'
+
+version '1.0.1'
+
+server_scripts {
+    '@es_extended/locale.lua',
+    'locales/de.lua',
+    'locales/br.lua',
+    'locales/en.lua',
+    'locales/es.lua',
+    'locales/fi.lua',
+    'locales/fr.lua',
+    'locales/sv.lua',
+    'locales/pl.lua',
+    'locales/tr.lua',
+    'config.lua',
+    'server/main.lua'
+}
+
+client_scripts {
+    '@es_extended/locale.lua',
+    'locales/de.lua',
+    'locales/br.lua',
+    'locales/en.lua',
+    'locales/es.lua',
+    'locales/fi.lua',
+    'locales/fr.lua',
+    'locales/sv.lua',
+    'locales/pl.lua',
+    'locales/tr.lua',
+    'config.lua',
+    'client/main.lua'
+}
+
+dependencies {
+    'es_extended',
+    'esx_status'
+>>>>>>> esx_basicneeds/master
+}
diff --git a/esx_basicneeds/locales/br.lua b/esx_basicneeds/locales/br.lua
new file mode 100644
index 00000000..5f24ee58
--- /dev/null
+++ b/esx_basicneeds/locales/br.lua
@@ -0,0 +1,4 @@
+Locales['br'] = {
+  ['used_bread'] = 'você comeu ~y~1x~s~ ~b~pão~s~',
+  ['used_water'] = 'você tomou ~y~1x~s~ ~b~água~s~',
+}
\ No newline at end of file
diff --git a/esx_basicneeds/locales/de.lua b/esx_basicneeds/locales/de.lua
new file mode 100644
index 00000000..52da2604
--- /dev/null
+++ b/esx_basicneeds/locales/de.lua
@@ -0,0 +1,4 @@
+Locales['de'] = {
+  ['used_bread'] = 'du hast ~y~1x~s~ ~b~Brot gegessen~s~',
+  ['used_water'] = 'du hast ~y~1x~s~ ~b~Wasser getrunken~s~',
+}
\ No newline at end of file
diff --git a/esx_basicneeds/locales/en.lua b/esx_basicneeds/locales/en.lua
new file mode 100644
index 00000000..52102ace
--- /dev/null
+++ b/esx_basicneeds/locales/en.lua
@@ -0,0 +1,4 @@
+Locales['en'] = {
+  ['used_bread'] = 'you have used ~y~1x~s~ ~b~bread~s~',
+  ['used_water'] = 'you have used ~y~1x~s~ ~b~water~s~',
+}
\ No newline at end of file
diff --git a/esx_basicneeds/locales/es.lua b/esx_basicneeds/locales/es.lua
new file mode 100644
index 00000000..90a3942e
--- /dev/null
+++ b/esx_basicneeds/locales/es.lua
@@ -0,0 +1,4 @@
+Locales['es'] = {
+  ['used_bread'] = 'Has usado ~y~1x~s~ ~b~pan~s~',
+  ['used_water'] = 'Has usado ~y~1x~s~ ~b~agua~s~',
+}
\ No newline at end of file
diff --git a/esx_basicneeds/locales/fi.lua b/esx_basicneeds/locales/fi.lua
new file mode 100644
index 00000000..aed8ec53
--- /dev/null
+++ b/esx_basicneeds/locales/fi.lua
@@ -0,0 +1,4 @@
+Locales['fi'] = {
+  ['used_bread'] = 'sinä söit ~y~1x~s~ ~b~leipä~s~',
+  ['used_water'] = 'sinä joit ~y~1x~s~ ~b~vesi~s~',
+}
\ No newline at end of file
diff --git a/esx_basicneeds/locales/fr.lua b/esx_basicneeds/locales/fr.lua
new file mode 100644
index 00000000..5cabcc3f
--- /dev/null
+++ b/esx_basicneeds/locales/fr.lua
@@ -0,0 +1,4 @@
+Locales['fr'] = {
+  ['used_bread'] = 'vous avez utilisé ~y~1x~s~ ~b~pain~s~',
+  ['used_water'] = 'vous avez utilisé ~y~1x~s~ ~b~eau~s~',
+}
\ No newline at end of file
diff --git a/esx_basicneeds/locales/pl.lua b/esx_basicneeds/locales/pl.lua
new file mode 100644
index 00000000..33f28d83
--- /dev/null
+++ b/esx_basicneeds/locales/pl.lua
@@ -0,0 +1,4 @@
+Locales['pl'] = {
+  ['used_bread'] = 'zjadłeś/aś ~y~1x~s~ ~b~chleb~s~',
+  ['used_water'] = 'wypiłeś/aś ~y~1x~s~ ~b~woda~s~',
+}
\ No newline at end of file
diff --git a/esx_basicneeds/locales/sv.lua b/esx_basicneeds/locales/sv.lua
new file mode 100644
index 00000000..a62e9f6d
--- /dev/null
+++ b/esx_basicneeds/locales/sv.lua
@@ -0,0 +1,4 @@
+Locales['sv'] = {
+  ['used_bread'] = 'du käkade upp en bit ~b~bröd~s~',
+  ['used_water'] = 'du drack upp en ~b~vattenflaska~s~',
+}
\ No newline at end of file
diff --git a/esx_basicneeds/locales/tr.lua b/esx_basicneeds/locales/tr.lua
new file mode 100644
index 00000000..153122e0
--- /dev/null
+++ b/esx_basicneeds/locales/tr.lua
@@ -0,0 +1,4 @@
+Locales['tr'] = {
+	['used_bread'] = '~y~1x~s~ ~b~ekmek~s~ kullandın',
+	['used_water'] = '~y~1x~s~ ~b~su~s~ kullandın',
+}
diff --git a/esx_basicneeds/localization/br_esx_basicneeds.sql b/esx_basicneeds/localization/br_esx_basicneeds.sql
new file mode 100644
index 00000000..01ffb90f
--- /dev/null
+++ b/esx_basicneeds/localization/br_esx_basicneeds.sql
@@ -0,0 +1,6 @@
+USE `es_extended`;
+
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Pao', 1),
+	('water', 'Agua', 1)
+;
diff --git a/esx_basicneeds/localization/cs_esx_basicneeds.sql b/esx_basicneeds/localization/cs_esx_basicneeds.sql
new file mode 100644
index 00000000..5e71921e
--- /dev/null
+++ b/esx_basicneeds/localization/cs_esx_basicneeds.sql
@@ -0,0 +1,6 @@
+USE `es_extended`;
+
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Chleba', 1),
+	('water', 'Voda', 1)
+;
diff --git a/esx_basicneeds/localization/de_esx_basicneeds.sql b/esx_basicneeds/localization/de_esx_basicneeds.sql
new file mode 100644
index 00000000..bf1fcf23
--- /dev/null
+++ b/esx_basicneeds/localization/de_esx_basicneeds.sql
@@ -0,0 +1,6 @@
+USE `es_extended`;
+
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Brot', 1),
+	('water', 'Wasser', 1)
+;
diff --git a/esx_basicneeds/localization/es_esx_basicneeds.sql b/esx_basicneeds/localization/es_esx_basicneeds.sql
new file mode 100644
index 00000000..f4c59fb7
--- /dev/null
+++ b/esx_basicneeds/localization/es_esx_basicneeds.sql
@@ -0,0 +1,6 @@
+USE `es_extended`;
+
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+    ('bread', 'Pan', 1),
+    ('water', 'Agua', 1)
+;
diff --git a/esx_basicneeds/localization/fi_esx_basicneeds.sql b/esx_basicneeds/localization/fi_esx_basicneeds.sql
new file mode 100644
index 00000000..b29b37b3
--- /dev/null
+++ b/esx_basicneeds/localization/fi_esx_basicneeds.sql
@@ -0,0 +1,6 @@
+USE `es_extended`;
+
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Leipä', 1),
+	('water', 'Vesi', 1)
+;
diff --git a/esx_basicneeds/localization/pl_esx_basicneeds.sql b/esx_basicneeds/localization/pl_esx_basicneeds.sql
new file mode 100644
index 00000000..96edfe34
--- /dev/null
+++ b/esx_basicneeds/localization/pl_esx_basicneeds.sql
@@ -0,0 +1,6 @@
+USE `es_extended`;
+
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Chleb', 1),
+	('water', 'Woda', 1)
+;
diff --git a/esx_basicneeds/localization/sv_esx_basicneeds.sql b/esx_basicneeds/localization/sv_esx_basicneeds.sql
new file mode 100644
index 00000000..27b0a4ee
--- /dev/null
+++ b/esx_basicneeds/localization/sv_esx_basicneeds.sql
@@ -0,0 +1,6 @@
+USE `es_extended`;
+
+INSERT INTO `items` (`name`, `label`, `weight`) VALUES
+	('bread', 'Bröd', 1),
+	('water', 'Vatten', 1)
+;
diff --git a/esx_basicneeds/server/main.lua b/esx_basicneeds/server/main.lua
new file mode 100644
index 00000000..bace91a0
--- /dev/null
+++ b/esx_basicneeds/server/main.lua
@@ -0,0 +1,154 @@
+ESX = nil
+
+TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
+<<<<<<< HEAD
+local isLegacy = not not ESX.GetExtendedPlayers
+
+AddEventHandler('onResourceStart', function(resourceName)
+	if (GetCurrentResourceName() ~= resourceName) then
+	  	return
+	end
+
+	local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers()
+	
+	for k,v in pairs(xPlayers) do
+		local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v)
+		MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', {
+			['@identifier'] = xPlayer.identifier
+		}, function(result)
+			local data = {}
+	
+			if result[1].status then
+				data = json.decode(result[1].status)
+			end
+		
+			xPlayer.set('status', data)
+			TriggerClientEvent('esx_status:load', k, data)
+		end)
+	end
+end)
+
+AddEventHandler('esx:playerLoaded', function(playerId, xPlayer)
+	MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', {
+		['@identifier'] = xPlayer.identifier
+	}, function(result)
+		local data = {}
+
+		if result[1].status then
+			data = json.decode(result[1].status)
+		end
+
+		xPlayer.set('status', data)
+		TriggerClientEvent('esx_status:load', playerId, data)
+	end)
+end)
+
+AddEventHandler('esx:playerDropped', function(playerId, reason)
+	local xPlayer = ESX.GetPlayerFromId(playerId)
+	local status = xPlayer.get('status')
+
+	MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', {
+		['@status']     = json.encode(status),
+		['@identifier'] = xPlayer.identifier
+	})
+end)
+
+AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb)
+	local xPlayer = ESX.GetPlayerFromId(playerId)
+	local status  = xPlayer.get('status')
+
+	for i=1, #status, 1 do
+		if status[i].name == statusName then
+			cb(status[i])
+			break
+		end
+	end
+end)
+
+RegisterServerEvent('esx_status:update')
+AddEventHandler('esx_status:update', function(status)
+	local xPlayer = ESX.GetPlayerFromId(source)
+
+	if xPlayer then
+		xPlayer.set('status', status)
+	end
+end)
+
+Citizen.CreateThread(function()
+	while(true) do
+		Citizen.Wait(10 * 60 * 1000)
+		
+		SaveData()
+
+	end
+
+end)
+
+function SaveData()
+	-- Example of a bulk update statement that we are building below
+	--[[
+	UPDATE users
+    SET status = (case when identifier = 'license:123' then '{hunger:45, thirst:23}'
+                         when identifier = 'license:456' then '{hunger:1000, thirst:1000}'
+                         when identifier = 'license:789' then '{hunger:1000, thirst:1000}'
+                    end)
+    WHERE identifier in ('license:123', 'license:456', 'license:789')
+
+	]]
+	local updateStatement = 'UPDATE users SET status = (case %s end) where identifier in (%s)'
+	local whenList = ''
+	local whereList = ''
+	local firstItem = true
+	local playerCount = 0
+
+	local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers()
+	
+	for k,v in pairs(xPlayers) do
+		local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v)
+		local status  = xPlayer.get('status')
+
+		whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status))
+
+		if firstItem == false then
+			whereList = whereList .. ', '
+		end
+		whereList = whereList .. string.format('\'%s\'', xPlayer.identifier)
+
+		firstItem = false
+		playerCount = playerCount + 1
+	end
+
+	if playerCount > 0 then
+		local sql = string.format(updateStatement, whenList, whereList)
+		MySQL.Async.execute(sql)
+
+	end
+
+end
+=======
+
+ESX.RegisterUsableItem('bread', function(source)
+	local xPlayer = ESX.GetPlayerFromId(source)
+	xPlayer.removeInventoryItem('bread', 1)
+
+	TriggerClientEvent('esx_status:add', source, 'hunger', 200000)
+	TriggerClientEvent('esx_basicneeds:onEat', source)
+	xPlayer.showNotification(_U('used_bread'))
+end)
+
+ESX.RegisterUsableItem('water', function(source)
+	local xPlayer = ESX.GetPlayerFromId(source)
+	xPlayer.removeInventoryItem('water', 1)
+
+	TriggerClientEvent('esx_status:add', source, 'thirst', 200000)
+	TriggerClientEvent('esx_basicneeds:onDrink', source)
+	xPlayer.showNotification(_U('used_water'))
+end)
+
+ESX.RegisterCommand('heal', 'admin', function(xPlayer, args, showError)
+	args.playerId.triggerEvent('esx_basicneeds:healPlayer')
+	args.playerId.triggerEvent('chat:addMessage', {args = {'^5HEAL', 'You have been healed.'}})
+end, true, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', validate = true, arguments = {
+	{name = 'playerId', help = 'the player id', type = 'player'}
+}})
+>>>>>>> esx_basicneeds/master
diff --git a/.editorconfig b/esx_status/.editorconfig
similarity index 100%
rename from .editorconfig
rename to esx_status/.editorconfig
diff --git a/LICENSE b/esx_status/LICENSE
similarity index 100%
rename from LICENSE
rename to esx_status/LICENSE
diff --git a/README.md b/esx_status/README.md
similarity index 100%
rename from README.md
rename to esx_status/README.md
diff --git a/client/classes/status.lua b/esx_status/client/classes/status.lua
similarity index 100%
rename from client/classes/status.lua
rename to esx_status/client/classes/status.lua
diff --git a/client/main.lua b/esx_status/client/main.lua
similarity index 100%
rename from client/main.lua
rename to esx_status/client/main.lua
diff --git a/config.lua b/esx_status/config.lua
similarity index 100%
rename from config.lua
rename to esx_status/config.lua
diff --git a/esx_status.sql b/esx_status/esx_status.sql
similarity index 100%
rename from esx_status.sql
rename to esx_status/esx_status.sql
diff --git a/fxmanifest.lua b/esx_status/fxmanifest.lua
similarity index 100%
rename from fxmanifest.lua
rename to esx_status/fxmanifest.lua
diff --git a/html/css/app.css b/esx_status/html/css/app.css
similarity index 100%
rename from html/css/app.css
rename to esx_status/html/css/app.css
diff --git a/html/scripts/app.js b/esx_status/html/scripts/app.js
similarity index 100%
rename from html/scripts/app.js
rename to esx_status/html/scripts/app.js
diff --git a/html/ui.html b/esx_status/html/ui.html
similarity index 100%
rename from html/ui.html
rename to esx_status/html/ui.html
diff --git a/server/classes/status.lua b/esx_status/server/classes/status.lua
similarity index 100%
rename from server/classes/status.lua
rename to esx_status/server/classes/status.lua
diff --git a/server/main.lua b/esx_status/server/main.lua
similarity index 100%
rename from server/main.lua
rename to esx_status/server/main.lua