Merge kaylee into pollyana, yay

(hope this works. never done it in git before)

Force-Push: yeah...
Change-Id: I71c8570d723808ccc8fbffea41c0722a61e1e1c0

21 files changed, 2368 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 794c189..ae48cae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,24 @@
 /result-*
 /.direnv
 *.swp
+
+__pycache__/
+*.pyc
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
diff --git a/src/COPYING b/src/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/src/COPYING
@@ -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/src/README.rst b/src/README.rst
new file mode 100644
index 0000000..7674312
--- /dev/null
+++ b/src/README.rst
@@ -0,0 +1,68 @@
+Kaylee
+======
+
+Kaylee is a somewhat fancy speech recognizer that runs commands and
+performs other functions when a user speaks loosely preset sentences. It
+is based on `Blather <https://gitlab.com/jezra/blather>`__ by
+`Jezra <http://www.jezra.net/>`__, but adds a lot of features that go
+beyond the original purpose of Blather.
+
+Requirements
+------------
+
+1. Python 3 (tested with 3.5, may work with older versions)
+2. pocketsphinx 5prealpha
+3. gstreamer-1.0 (and what ever plugin has pocketsphinx support)
+4. gstreamer-1.0 base plugins (required for ALSA)
+5. python-gobject (required for GStreamer and the GTK-based UI)
+6. python-requests (required for automatic language updating)
+
+**Note:** it may also be required to install
+``pocketsphinx-hmm-en-hub4wsj``
+
+Usage
+-----
+
+1. Copy options.json.tmp to ~/.config/kaylee/options.json and fill the
+   "commands" section of the file with sentences to speak and commands
+   to run.
+2. Run Kaylee with ``./kaylee.py``. This generates a language model and
+   dictionary using the `Sphinx Knowledge Base Tool
+   <http://www.speech.cs.cmu.edu/tools/lmtool.html>`__, then listens for
+   commands with the system default microphone.
+
+   -  For the GTK UI, run ``./kaylee.py -i g``.
+   -  To start a UI in 'continuous' listen mode, use the ``-c`` flag.
+   -  To use a microphone other than the system default, use the ``-m``
+      flag.
+
+3. Start talking!
+
+**Note:** default values for command-line arguments may be specified in
+the options.json file.
+
+Examples
+~~~~~~~~
+
+-  To run Kaylee with the GTK UI, starting in continuous listen mode:
+   ``./kaylee.py -i g -c``
+
+-  To run Kaylee with no UI and using a USB microphone recognized as
+   device 2: ``./kaylee.py -m 2``
+
+-  To have Kaylee pass each word of the matched sentence as a separate
+   argument to the executed command: ``./kaylee.py -p``
+
+-  To run a command when a valid sentence has been detected:
+   ``./kaylee.py --valid-sentence-command=/path/to/command``
+
+-  To run a command when a invalid sentence has been detected:
+   ``./kaylee.py --invalid-sentence-command=/path/to/command``
+
+Finding the Device Number of a USB microphone
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There are a few ways to find the device number of a USB microphone.
+
+-  ``cat /proc/asound/cards``
+-  ``arecord -l``
diff --git a/src/assets/kaylee.svg b/src/assets/kaylee.svg
new file mode 100644
index 0000000..2ae00d5
--- /dev/null
+++ b/src/assets/kaylee.svg
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="0.91 r13725"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 256 256"
+   height="256"
+   width="256"
+   sodipodi:docname="kaylee.svg"
+   inkscape:export-filename="/home/clay/kaylee/data/icon.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="143.50742"
+     inkscape:cx="79.43858"
+     inkscape:zoom="2.72"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5639"
+       empspacing="4"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-796.36216)">
+    <path
+       id="circle5600"
+       style="opacity:1;fill:#f2f208;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 128.00003,1027.2322 c 49.12878,-6.9503 89.36712,-52.05721 81.27998,-102.87014 -6.07446,-38.16681 -41.64751,-69.43881 -81.28004,-62.22998 -28.589024,5.20011 -52.050777,32.39689 -45.719978,62.23003 4.328066,20.39552 24.306748,37.20283 45.720018,31.74998 13.58631,-3.45972 24.89414,-17.37992 20.31999,-31.75001 -2.59775,-8.1611 -11.62202,-15.12154 -20.32,-11.42999 -4.11869,1.74803 -7.87213,7.04415 -5.08,11.43 0.92656,1.45546 3.65376,3.08595 5.08,1.27 0.12445,-0.15846 0.5638,-1.27 0,-1.27 0,-0.5638 1.11154,-0.12445 1.27,0 1.81594,1.42623 0.18545,4.15343 -1.27,5.08 -4.38586,2.79213 -9.68198,-0.96132 -11.43,-5.08 -3.69155,-8.69799 3.2689,-17.72225 11.43,-20.32001 14.37009,-4.57413 28.29027,6.7337 31.75001,20.32001 5.45284,21.41327 -11.35448,41.39194 -31.75001,45.72 C 98.166854,976.41289 70.97009,952.95112 65.76999,924.3621 58.561173,884.72957 89.833173,849.15653 128,843.08208 c 50.81293,-8.08713 95.9197,32.15123 102.87002,81.28001 C 239.83577,987.73729 189.47484,1043.535 128,1051.3622 57.859845,1051.3622 1.000017,994.50224 1,924.36211 8.8272224,985.83697 64.624822,1036.198 128.00003,1027.2322 Z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 230.86998,924.36208 c -6.95033,-49.12878 -52.05712,-89.36712 -102.87005,-81.27998 -38.166817,6.07446 -69.438808,41.64751 -62.229982,81.28004 5.200108,28.58902 32.396881,52.05079 62.230022,45.71998 20.39553,-4.32807 37.20285,-24.30675 31.75,-45.72001 -3.45974,-13.58631 -17.37993,-24.89415 -31.75002,-20.32 -8.1611,2.59775 -15.12154,11.62202 -11.42999,20.32 1.74802,4.11869 7.04414,7.87213 11.43,5.08001 1.45545,-0.92657 3.08594,-3.65377 1.27,-5.08001 -0.15846,-0.12445 -1.27,-0.5638 -1.27,0 -0.5638,0 -0.12446,-1.11154 0,-1.27 1.42623,-1.81593 4.15343,-0.18545 5.08,1.27 2.79212,4.38586 -0.96132,9.68198 -5.08,11.43 -8.69799,3.69155 -17.72225,-3.2689 -20.32001,-11.43 -4.57414,-14.37009 6.7337,-28.29027 20.32001,-31.75001 21.41327,-5.45284 41.39195,11.35449 45.72001,31.75001 6.33079,29.83315 -17.13097,57.02991 -45.72001,62.23001 -39.632528,7.20881 -75.205569,-24.06319 -81.280014,-62.23001 -8.087133,-50.81292 32.151221,-95.9197 81.280014,-102.87002 63.3752,-8.96575 119.17278,41.39518 126.99999,102.87002 -1e-5,70.14015 -56.85985,127.00009 -126.99997,127.00009 61.47485,-7.8272 111.83577,-63.62492 102.87,-127.00012 z"
+       style="opacity:1;fill:#f30c0c;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5604"
+       inkscape:transform-center-x="18.009302"
+       inkscape:transform-center-y="-26.837762" />
+    <path
+       inkscape:transform-center-y="18.009309"
+       inkscape:transform-center-x="26.837762"
+       id="path5608"
+       style="opacity:1;fill:#f0f0f0;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 127.99999,821.49211 c -49.12879,6.95033 -89.367126,52.05712 -81.279976,102.87005 6.074453,38.1668 41.647503,69.4388 81.280036,62.22998 28.58903,-5.20011 52.05078,-32.39688 45.71999,-62.23003 -4.32807,-20.39552 -24.30676,-37.20284 -45.72003,-31.74999 -13.5863,3.45973 -24.89414,17.37993 -20.31999,31.75002 2.59776,8.16109 11.62202,15.12154 20.32,11.42999 4.11869,-1.74803 7.87213,-7.04415 5.08,-11.43 -0.92656,-1.45546 -3.65376,-3.08595 -5.08,-1.27 -0.12445,0.15846 -0.56379,1.27 0,1.27 0,0.56379 -1.11154,0.12445 -1.27,0 -1.81594,-1.42623 -0.18545,-4.15343 1.27,-5.08 4.38586,-2.79213 9.68198,0.96132 11.43,5.08 3.69155,8.69799 -3.26889,17.72224 -11.43,20.32001 -14.37009,4.57413 -28.290276,-6.7337 -31.750002,-20.32001 -5.452848,-21.41327 11.354472,-41.39195 31.750002,-45.72001 29.83314,-6.33079 57.02991,17.13097 62.23001,45.72 7.20882,39.63253 -24.06318,75.20558 -62.23001,81.28008 -50.812924,8.0873 -95.919704,-32.15129 -102.870008,-81.28007 -8.965761,-63.3752 41.395163,-119.17278 102.870008,-127 70.14015,2e-5 126.99998,56.85985 127,126.99998 -7.82723,-61.47486 -63.62483,-111.83577 -127.00003,-102.87 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 25.130062,924.36211 c 6.950313,49.12878 52.057111,89.36729 102.870038,81.28009 38.16682,-6.07457 69.43881,-41.64762 62.22997,-81.28015 -5.2001,-28.58903 -32.39687,-52.05079 -62.23001,-45.71999 -20.39553,4.32807 -37.202847,24.30676 -31.749991,45.72002 3.459726,13.58631 17.379921,24.89414 31.750011,20.32 8.1611,-2.59777 15.12154,-11.62202 11.42999,-20.32001 -1.74802,-4.11868 -7.04415,-7.87213 -11.43,-5.08 -1.45545,0.92657 -3.08594,3.65377 -1.27,5.08 0.15846,0.12445 1.27,0.56379 1.27,0 0.56381,0 0.12445,1.11154 0,1.27 -1.42623,1.81594 -4.15343,0.18545 -5.08,-1.27 -2.79212,-4.38586 0.96132,-9.68198 5.08,-11.42999 8.69799,-3.69155 17.72225,3.26888 20.32001,11.42999 4.57414,14.3701 -6.7337,28.29028 -20.32001,31.75 -21.41327,5.45285 -41.391944,-11.35447 -45.720002,-31.75 -6.33079,-29.83314 17.130971,-57.0299 45.720002,-62.23001 39.63252,-7.20882 75.20557,24.06319 81.28002,62.23001 8.08712,50.81293 -32.15123,95.91983 -81.28002,102.87013 C 64.624865,1036.198 8.8272817,985.83692 1.0000762,924.36207 1.0000931,854.22192 57.859921,797.36209 128.00005,797.36208 66.525192,805.1893 16.164277,860.9869 25.130062,924.36211 Z"
+       style="opacity:1;fill:#0be50b;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5610"
+       inkscape:transform-center-x="-18.009294"
+       inkscape:transform-center-y="26.837765" />
+    <path
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 99.516342,1049.1527 156.48171,799.57116"
+       id="path5653"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6297"
+       d="M 72.461968,1039.6857 183.53624,809.03772"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 48.192533,1024.436 207.80591,824.2871"
+       id="path6299"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6301"
+       d="M 27.924946,1004.1681 228.07381,844.55469"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 12.675558,979.89839 243.32358,868.82413"
+       id="path6303"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6305"
+       d="M 3.2090063,952.84387 252.79055,895.87851"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 0,924.36117 256,-2e-5"
+       id="path6307"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6309"
+       d="M 3.2094496,895.87851 252.79099,952.84387"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 12.676419,868.82414 243.32444,979.89838"
+       id="path6311"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6313"
+       d="M 27.926195,844.55468 228.07505,1004.1681"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 48.194085,824.28711 207.80747,1024.436"
+       id="path6315"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6317"
+       d="M 72.463777,809.03771 183.53802,1039.6857"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 99.518287,799.57117 156.48366,1049.1527"
+       id="path6319"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6321"
+       d="m 128.00101,796.36216 -2e-5,256.00004"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#9e4d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 128.00003,1027.2322 c 49.12878,-6.9503 89.36712,-52.05721 81.27998,-102.87014 -6.07446,-38.16681 -41.64751,-69.43881 -81.28004,-62.22998 -28.589024,5.20011 -52.050777,32.39689 -45.719978,62.23003 4.328066,20.39552 24.306748,37.20283 45.720018,31.74998 13.58631,-3.45972 24.89414,-17.37992 20.31999,-31.75001 -2.59775,-8.1611 -11.62202,-15.12154 -20.32,-11.42999 -4.11869,1.74803 -7.87213,7.04415 -5.08,11.43 0.92656,1.45546 3.65376,3.08595 5.08,1.27 0.12445,-0.15846 0.5638,-1.27 0,-1.27 0,-0.5638 1.11154,-0.12445 1.27,0 1.81594,1.42623 0.18545,4.15343 -1.27,5.08 -4.38586,2.79213 -9.68198,-0.96132 -11.43,-5.08 -3.69155,-8.69799 3.2689,-17.72225 11.43,-20.32001 14.37009,-4.57413 28.29027,6.7337 31.75001,20.32001 5.45284,21.41327 -11.35448,41.39194 -31.75001,45.72 C 98.166854,976.41289 70.97009,952.95112 65.76999,924.3621 58.561173,884.72957 89.833173,849.15653 128,843.08208 c 50.81293,-8.08713 95.9197,32.15123 102.87002,81.28001 C 239.83577,987.73729 189.47484,1043.535 128,1051.3622 57.859845,1051.3622 1.000017,994.50224 1,924.36211 8.8272224,985.83697 64.624822,1036.198 128.00003,1027.2322 Z"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6329" />
+    <path
+       inkscape:transform-center-y="-26.837762"
+       inkscape:transform-center-x="18.009302"
+       id="path6331"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 230.86998,924.36208 c -6.95033,-49.12878 -52.05712,-89.36712 -102.87005,-81.27998 -38.166817,6.07446 -69.438808,41.64751 -62.229982,81.28004 5.200108,28.58902 32.396881,52.05079 62.230022,45.71998 20.39553,-4.32807 37.20285,-24.30675 31.75,-45.72001 -3.45974,-13.58631 -17.37993,-24.89415 -31.75002,-20.32 -8.1611,2.59775 -15.12154,11.62202 -11.42999,20.32 1.74802,4.11869 7.04414,7.87213 11.43,5.08001 1.45545,-0.92657 3.08594,-3.65377 1.27,-5.08001 -0.15846,-0.12445 -1.27,-0.5638 -1.27,0 -0.5638,0 -0.12446,-1.11154 0,-1.27 1.42623,-1.81593 4.15343,-0.18545 5.08,1.27 2.79212,4.38586 -0.96132,9.68198 -5.08,11.43 -8.69799,3.69155 -17.72225,-3.2689 -20.32001,-11.43 -4.57414,-14.37009 6.7337,-28.29027 20.32001,-31.75001 21.41327,-5.45284 41.39195,11.35449 45.72001,31.75001 6.33079,29.83315 -17.13097,57.02991 -45.72001,62.23001 -39.632528,7.20881 -75.205569,-24.06319 -81.280014,-62.23001 -8.087133,-50.81292 32.151221,-95.9197 81.280014,-102.87002 63.3752,-8.96575 119.17278,41.39518 126.99999,102.87002 -1e-5,70.14015 -56.85985,127.00009 -126.99997,127.00009 61.47485,-7.8272 111.83577,-63.62492 102.87,-127.00012 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 127.99999,821.49211 c -49.12879,6.95033 -89.367126,52.05712 -81.279976,102.87005 6.074453,38.1668 41.647503,69.4388 81.280036,62.22998 28.58903,-5.20011 52.05078,-32.39688 45.71999,-62.23003 -4.32807,-20.39552 -24.30676,-37.20284 -45.72003,-31.74999 -13.5863,3.45973 -24.89414,17.37993 -20.31999,31.75002 2.59776,8.16109 11.62202,15.12154 20.32,11.42999 4.11869,-1.74803 7.87213,-7.04415 5.08,-11.43 -0.92656,-1.45546 -3.65376,-3.08595 -5.08,-1.27 -0.12445,0.15846 -0.56379,1.27 0,1.27 0,0.56379 -1.11154,0.12445 -1.27,0 -1.81594,-1.42623 -0.18545,-4.15343 1.27,-5.08 4.38586,-2.79213 9.68198,0.96132 11.43,5.08 3.69155,8.69799 -3.26889,17.72224 -11.43,20.32001 -14.37009,4.57413 -28.290276,-6.7337 -31.750002,-20.32001 -5.452848,-21.41327 11.354472,-41.39195 31.750002,-45.72001 29.83314,-6.33079 57.02991,17.13097 62.23001,45.72 7.20882,39.63253 -24.06318,75.20558 -62.23001,81.28008 -50.812924,8.0873 -95.919704,-32.15129 -102.870008,-81.28007 -8.965761,-63.3752 41.395163,-119.17278 102.870008,-127 70.14015,2e-5 126.99998,56.85985 127,126.99998 -7.82723,-61.47486 -63.62483,-111.83577 -127.00003,-102.87 z"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6333"
+       inkscape:transform-center-x="26.837762"
+       inkscape:transform-center-y="18.009309" />
+    <path
+       inkscape:transform-center-y="26.837765"
+       inkscape:transform-center-x="-18.009294"
+       id="path6335"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 25.130062,924.36211 c 6.950313,49.12878 52.057111,89.36729 102.870038,81.28009 38.16682,-6.07457 69.43881,-41.64762 62.22997,-81.28015 -5.2001,-28.58903 -32.39687,-52.05079 -62.23001,-45.71999 -20.39553,4.32807 -37.202847,24.30676 -31.749991,45.72002 3.459726,13.58631 17.379921,24.89414 31.750011,20.32 8.1611,-2.59777 15.12154,-11.62202 11.42999,-20.32001 -1.74802,-4.11868 -7.04415,-7.87213 -11.43,-5.08 -1.45545,0.92657 -3.08594,3.65377 -1.27,5.08 0.15846,0.12445 1.27,0.56379 1.27,0 0.56381,0 0.12445,1.11154 0,1.27 -1.42623,1.81594 -4.15343,0.18545 -5.08,-1.27 -2.79212,-4.38586 0.96132,-9.68198 5.08,-11.42999 8.69799,-3.69155 17.72225,3.26888 20.32001,11.42999 4.57414,14.3701 -6.7337,28.29028 -20.32001,31.75 -21.41327,5.45285 -41.391944,-11.35447 -45.720002,-31.75 -6.33079,-29.83314 17.130971,-57.0299 45.720002,-62.23001 39.63252,-7.20882 75.20557,24.06319 81.28002,62.23001 8.08712,50.81293 -32.15123,95.91983 -81.28002,102.87013 C 64.624865,1036.198 8.8272817,985.83692 1.0000762,924.36207 1.0000931,854.22192 57.859921,797.36209 128.00005,797.36208 66.525192,805.1893 16.164277,860.9869 25.130062,924.36211 Z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <circle
+       style="opacity:1;fill:#9e4d00;fill-opacity:1;stroke:#643100;stroke-width:1.333;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6337"
+       cx="128"
+       cy="924.36218"
+       r="7.3333225" />
+  </g>
+</svg>
diff --git a/src/assets/kaylee_gray.svg b/src/assets/kaylee_gray.svg
new file mode 100644
index 0000000..75bce7d
--- /dev/null
+++ b/src/assets/kaylee_gray.svg
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="0.91 r13725"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 256 256"
+   height="256"
+   width="256"
+   sodipodi:docname="kaylee_gray.svg"
+   inkscape:export-filename="/home/clay/kaylee/data/icon_inactive.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="146.86035"
+     inkscape:cx="93.758692"
+     inkscape:zoom="7.68"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5639"
+       empspacing="4"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-796.36216)">
+    <path
+       id="circle5600"
+       style="opacity:1;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 128.00003,1027.2322 c 49.12878,-6.9503 89.36712,-52.05721 81.27998,-102.87014 -6.07446,-38.16681 -41.64751,-69.43881 -81.28004,-62.22998 -28.589024,5.20011 -52.050777,32.39689 -45.719978,62.23003 4.328066,20.39552 24.306748,37.20283 45.720018,31.74998 13.58631,-3.45972 24.89414,-17.37992 20.31999,-31.75001 -2.59775,-8.1611 -11.62202,-15.12154 -20.32,-11.42999 -4.11869,1.74803 -7.87213,7.04415 -5.08,11.43 0.92656,1.45546 3.65376,3.08595 5.08,1.27 0.12445,-0.15846 0.5638,-1.27 0,-1.27 0,-0.5638 1.11154,-0.12445 1.27,0 1.81594,1.42623 0.18545,4.15343 -1.27,5.08 -4.38586,2.79213 -9.68198,-0.96132 -11.43,-5.08 -3.69155,-8.69799 3.2689,-17.72225 11.43,-20.32001 14.37009,-4.57413 28.29027,6.7337 31.75001,20.32001 5.45284,21.41327 -11.35448,41.39194 -31.75001,45.72 C 98.166854,976.41289 70.97009,952.95112 65.76999,924.3621 58.561173,884.72957 89.833173,849.15653 128,843.08208 c 50.81293,-8.08713 95.9197,32.15123 102.87002,81.28001 C 239.83577,987.73729 189.47484,1043.535 128,1051.3622 57.859845,1051.3622 1.000017,994.50224 1,924.36211 8.8272224,985.83697 64.624822,1036.198 128.00003,1027.2322 Z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 230.86998,924.36208 c -6.95033,-49.12878 -52.05712,-89.36712 -102.87005,-81.27998 -38.166817,6.07446 -69.438808,41.64751 -62.229982,81.28004 5.200108,28.58902 32.396881,52.05079 62.230022,45.71998 20.39553,-4.32807 37.20285,-24.30675 31.75,-45.72001 -3.45974,-13.58631 -17.37993,-24.89415 -31.75002,-20.32 -8.1611,2.59775 -15.12154,11.62202 -11.42999,20.32 1.74802,4.11869 7.04414,7.87213 11.43,5.08001 1.45545,-0.92657 3.08594,-3.65377 1.27,-5.08001 -0.15846,-0.12445 -1.27,-0.5638 -1.27,0 -0.5638,0 -0.12446,-1.11154 0,-1.27 1.42623,-1.81593 4.15343,-0.18545 5.08,1.27 2.79212,4.38586 -0.96132,9.68198 -5.08,11.43 -8.69799,3.69155 -17.72225,-3.2689 -20.32001,-11.43 -4.57414,-14.37009 6.7337,-28.29027 20.32001,-31.75001 21.41327,-5.45284 41.39195,11.35449 45.72001,31.75001 6.33079,29.83315 -17.13097,57.02991 -45.72001,62.23001 -39.632528,7.20881 -75.205569,-24.06319 -81.280014,-62.23001 -8.087133,-50.81292 32.151221,-95.9197 81.280014,-102.87002 63.3752,-8.96575 119.17278,41.39518 126.99999,102.87002 -1e-5,70.14015 -56.85985,127.00009 -126.99997,127.00009 61.47485,-7.8272 111.83577,-63.62492 102.87,-127.00012 z"
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5604"
+       inkscape:transform-center-x="18.009302"
+       inkscape:transform-center-y="-26.837762" />
+    <path
+       inkscape:transform-center-y="18.009309"
+       inkscape:transform-center-x="26.837762"
+       id="path5608"
+       style="opacity:1;fill:#f0f0f0;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 127.99999,821.49211 c -49.12879,6.95033 -89.367126,52.05712 -81.279976,102.87005 6.074453,38.1668 41.647503,69.4388 81.280036,62.22998 28.58903,-5.20011 52.05078,-32.39688 45.71999,-62.23003 -4.32807,-20.39552 -24.30676,-37.20284 -45.72003,-31.74999 -13.5863,3.45973 -24.89414,17.37993 -20.31999,31.75002 2.59776,8.16109 11.62202,15.12154 20.32,11.42999 4.11869,-1.74803 7.87213,-7.04415 5.08,-11.43 -0.92656,-1.45546 -3.65376,-3.08595 -5.08,-1.27 -0.12445,0.15846 -0.56379,1.27 0,1.27 0,0.56379 -1.11154,0.12445 -1.27,0 -1.81594,-1.42623 -0.18545,-4.15343 1.27,-5.08 4.38586,-2.79213 9.68198,0.96132 11.43,5.08 3.69155,8.69799 -3.26889,17.72224 -11.43,20.32001 -14.37009,4.57413 -28.290276,-6.7337 -31.750002,-20.32001 -5.452848,-21.41327 11.354472,-41.39195 31.750002,-45.72001 29.83314,-6.33079 57.02991,17.13097 62.23001,45.72 7.20882,39.63253 -24.06318,75.20558 -62.23001,81.28008 -50.812924,8.0873 -95.919704,-32.15129 -102.870008,-81.28007 -8.965761,-63.3752 41.395163,-119.17278 102.870008,-127 70.14015,2e-5 126.99998,56.85985 127,126.99998 -7.82723,-61.47486 -63.62483,-111.83577 -127.00003,-102.87 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 25.130062,924.36211 c 6.950313,49.12878 52.057111,89.36729 102.870038,81.28009 38.16682,-6.07457 69.43881,-41.64762 62.22997,-81.28015 -5.2001,-28.58903 -32.39687,-52.05079 -62.23001,-45.71999 -20.39553,4.32807 -37.202847,24.30676 -31.749991,45.72002 3.459726,13.58631 17.379921,24.89414 31.750011,20.32 8.1611,-2.59777 15.12154,-11.62202 11.42999,-20.32001 -1.74802,-4.11868 -7.04415,-7.87213 -11.43,-5.08 -1.45545,0.92657 -3.08594,3.65377 -1.27,5.08 0.15846,0.12445 1.27,0.56379 1.27,0 0.56381,0 0.12445,1.11154 0,1.27 -1.42623,1.81594 -4.15343,0.18545 -5.08,-1.27 -2.79212,-4.38586 0.96132,-9.68198 5.08,-11.42999 8.69799,-3.69155 17.72225,3.26888 20.32001,11.42999 4.57414,14.3701 -6.7337,28.29028 -20.32001,31.75 -21.41327,5.45285 -41.391944,-11.35447 -45.720002,-31.75 -6.33079,-29.83314 17.130971,-57.0299 45.720002,-62.23001 39.63252,-7.20882 75.20557,24.06319 81.28002,62.23001 8.08712,50.81293 -32.15123,95.91983 -81.28002,102.87013 C 64.624865,1036.198 8.8272817,985.83692 1.0000762,924.36207 1.0000931,854.22192 57.859921,797.36209 128.00005,797.36208 66.525192,805.1893 16.164277,860.9869 25.130062,924.36211 Z"
+       style="opacity:1;fill:#969696;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5610"
+       inkscape:transform-center-x="-18.009294"
+       inkscape:transform-center-y="26.837765" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 99.516342,1049.1527 156.48171,799.57116"
+       id="path5653"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6297"
+       d="M 72.461968,1039.6857 183.53624,809.03772"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 48.192533,1024.436 207.80591,824.2871"
+       id="path6299"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6301"
+       d="M 27.924946,1004.1681 228.07381,844.55469"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 12.675558,979.89839 243.32358,868.82413"
+       id="path6303"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6305"
+       d="M 3.2090063,952.84387 252.79055,895.87851"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 0,924.36117 256,-2e-5"
+       id="path6307"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6309"
+       d="M 3.2094496,895.87851 252.79099,952.84387"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 12.676419,868.82414 243.32444,979.89838"
+       id="path6311"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6313"
+       d="M 27.926195,844.55468 228.07505,1004.1681"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 48.194085,824.28711 207.80747,1024.436"
+       id="path6315"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6317"
+       d="M 72.463777,809.03771 183.53802,1039.6857"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 99.518287,799.57117 156.48366,1049.1527"
+       id="path6319"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path6321"
+       d="m 128.00101,796.36216 -2e-5,256.00004"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#323232;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 128.00003,1027.2322 c 49.12878,-6.9503 89.36712,-52.05721 81.27998,-102.87014 -6.07446,-38.16681 -41.64751,-69.43881 -81.28004,-62.22998 -28.589024,5.20011 -52.050777,32.39689 -45.719978,62.23003 4.328066,20.39552 24.306748,37.20283 45.720018,31.74998 13.58631,-3.45972 24.89414,-17.37992 20.31999,-31.75001 -2.59775,-8.1611 -11.62202,-15.12154 -20.32,-11.42999 -4.11869,1.74803 -7.87213,7.04415 -5.08,11.43 0.92656,1.45546 3.65376,3.08595 5.08,1.27 0.12445,-0.15846 0.5638,-1.27 0,-1.27 0,-0.5638 1.11154,-0.12445 1.27,0 1.81594,1.42623 0.18545,4.15343 -1.27,5.08 -4.38586,2.79213 -9.68198,-0.96132 -11.43,-5.08 -3.69155,-8.69799 3.2689,-17.72225 11.43,-20.32001 14.37009,-4.57413 28.29027,6.7337 31.75001,20.32001 5.45284,21.41327 -11.35448,41.39194 -31.75001,45.72 C 98.166854,976.41289 70.97009,952.95112 65.76999,924.3621 58.561173,884.72957 89.833173,849.15653 128,843.08208 c 50.81293,-8.08713 95.9197,32.15123 102.87002,81.28001 C 239.83577,987.73729 189.47484,1043.535 128,1051.3622 57.859845,1051.3622 1.000017,994.50224 1,924.36211 8.8272224,985.83697 64.624822,1036.198 128.00003,1027.2322 Z"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6329" />
+    <path
+       inkscape:transform-center-y="-26.837762"
+       inkscape:transform-center-x="18.009302"
+       id="path6331"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 230.86998,924.36208 c -6.95033,-49.12878 -52.05712,-89.36712 -102.87005,-81.27998 -38.166817,6.07446 -69.438808,41.64751 -62.229982,81.28004 5.200108,28.58902 32.396881,52.05079 62.230022,45.71998 20.39553,-4.32807 37.20285,-24.30675 31.75,-45.72001 -3.45974,-13.58631 -17.37993,-24.89415 -31.75002,-20.32 -8.1611,2.59775 -15.12154,11.62202 -11.42999,20.32 1.74802,4.11869 7.04414,7.87213 11.43,5.08001 1.45545,-0.92657 3.08594,-3.65377 1.27,-5.08001 -0.15846,-0.12445 -1.27,-0.5638 -1.27,0 -0.5638,0 -0.12446,-1.11154 0,-1.27 1.42623,-1.81593 4.15343,-0.18545 5.08,1.27 2.79212,4.38586 -0.96132,9.68198 -5.08,11.43 -8.69799,3.69155 -17.72225,-3.2689 -20.32001,-11.43 -4.57414,-14.37009 6.7337,-28.29027 20.32001,-31.75001 21.41327,-5.45284 41.39195,11.35449 45.72001,31.75001 6.33079,29.83315 -17.13097,57.02991 -45.72001,62.23001 -39.632528,7.20881 -75.205569,-24.06319 -81.280014,-62.23001 -8.087133,-50.81292 32.151221,-95.9197 81.280014,-102.87002 63.3752,-8.96575 119.17278,41.39518 126.99999,102.87002 -1e-5,70.14015 -56.85985,127.00009 -126.99997,127.00009 61.47485,-7.8272 111.83577,-63.62492 102.87,-127.00012 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 127.99999,821.49211 c -49.12879,6.95033 -89.367126,52.05712 -81.279976,102.87005 6.074453,38.1668 41.647503,69.4388 81.280036,62.22998 28.58903,-5.20011 52.05078,-32.39688 45.71999,-62.23003 -4.32807,-20.39552 -24.30676,-37.20284 -45.72003,-31.74999 -13.5863,3.45973 -24.89414,17.37993 -20.31999,31.75002 2.59776,8.16109 11.62202,15.12154 20.32,11.42999 4.11869,-1.74803 7.87213,-7.04415 5.08,-11.43 -0.92656,-1.45546 -3.65376,-3.08595 -5.08,-1.27 -0.12445,0.15846 -0.56379,1.27 0,1.27 0,0.56379 -1.11154,0.12445 -1.27,0 -1.81594,-1.42623 -0.18545,-4.15343 1.27,-5.08 4.38586,-2.79213 9.68198,0.96132 11.43,5.08 3.69155,8.69799 -3.26889,17.72224 -11.43,20.32001 -14.37009,4.57413 -28.290276,-6.7337 -31.750002,-20.32001 -5.452848,-21.41327 11.354472,-41.39195 31.750002,-45.72001 29.83314,-6.33079 57.02991,17.13097 62.23001,45.72 7.20882,39.63253 -24.06318,75.20558 -62.23001,81.28008 -50.812924,8.0873 -95.919704,-32.15129 -102.870008,-81.28007 -8.965761,-63.3752 41.395163,-119.17278 102.870008,-127 70.14015,2e-5 126.99998,56.85985 127,126.99998 -7.82723,-61.47486 -63.62483,-111.83577 -127.00003,-102.87 z"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6333"
+       inkscape:transform-center-x="26.837762"
+       inkscape:transform-center-y="18.009309" />
+    <path
+       inkscape:transform-center-y="26.837765"
+       inkscape:transform-center-x="-18.009294"
+       id="path6335"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 25.130062,924.36211 c 6.950313,49.12878 52.057111,89.36729 102.870038,81.28009 38.16682,-6.07457 69.43881,-41.64762 62.22997,-81.28015 -5.2001,-28.58903 -32.39687,-52.05079 -62.23001,-45.71999 -20.39553,4.32807 -37.202847,24.30676 -31.749991,45.72002 3.459726,13.58631 17.379921,24.89414 31.750011,20.32 8.1611,-2.59777 15.12154,-11.62202 11.42999,-20.32001 -1.74802,-4.11868 -7.04415,-7.87213 -11.43,-5.08 -1.45545,0.92657 -3.08594,3.65377 -1.27,5.08 0.15846,0.12445 1.27,0.56379 1.27,0 0.56381,0 0.12445,1.11154 0,1.27 -1.42623,1.81594 -4.15343,0.18545 -5.08,-1.27 -2.79212,-4.38586 0.96132,-9.68198 5.08,-11.42999 8.69799,-3.69155 17.72225,3.26888 20.32001,11.42999 4.57414,14.3701 -6.7337,28.29028 -20.32001,31.75 -21.41327,5.45285 -41.391944,-11.35447 -45.720002,-31.75 -6.33079,-29.83314 17.130971,-57.0299 45.720002,-62.23001 39.63252,-7.20882 75.20557,24.06319 81.28002,62.23001 8.08712,50.81293 -32.15123,95.91983 -81.28002,102.87013 C 64.624865,1036.198 8.8272817,985.83692 1.0000762,924.36207 1.0000931,854.22192 57.859921,797.36209 128.00005,797.36208 66.525192,805.1893 16.164277,860.9869 25.130062,924.36211 Z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <circle
+       style="opacity:1;fill:#323232;fill-opacity:1;stroke:#232323;stroke-width:1.333;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6337"
+       cx="128"
+       cy="924.36218"
+       r="7.3333225" />
+  </g>
+</svg>
diff --git a/src/assets/kaylee_small.svg b/src/assets/kaylee_small.svg
new file mode 100644
index 0000000..6a0268d
--- /dev/null
+++ b/src/assets/kaylee_small.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="0.91 r13725"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 32 32"
+   height="32"
+   width="32"
+   sodipodi:docname="kaylee_small.svg"
+   inkscape:export-filename="/home/clay/kaylee/data/icon_small.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="12.418672"
+     inkscape:cx="-4.4302686"
+     inkscape:zoom="21.76"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5639"
+       empspacing="4"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       id="circle5600"
+       style="opacity:1;fill:#f2f208;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 16.000003,1049.2209 c 6.141098,-0.8688 11.17089,-6.5071 10.159998,-12.8587 -0.759308,-4.7709 -5.205939,-8.6799 -10.160006,-7.7788 -3.573628,0.65 -6.5063471,4.0496 -5.714997,7.7788 0.541008,2.5494 3.038343,4.6503 5.715002,3.9687 1.698289,-0.4324 3.111768,-2.1725 2.539999,-3.9687 -0.324719,-1.0202 -1.452752,-1.8902 -2.54,-1.4288 -0.514836,0.2185 -0.984016,0.8805 -0.635,1.4288 0.11582,0.1819 0.45672,0.3857 0.635,0.1587 0.01556,-0.02 0.07048,-0.1587 0,-0.1587 0,-0.071 0.138943,-0.016 0.15875,0 0.226993,0.1782 0.02318,0.5191 -0.15875,0.635 -0.548232,0.349 -1.210248,-0.1202 -1.42875,-0.635 -0.461444,-1.0873 0.408613,-2.2153 1.42875,-2.54 1.796261,-0.5718 3.536284,0.8417 3.968751,2.54 0.681606,2.6766 -1.41931,5.174 -3.968751,5.715 -3.729143,0.7913 -7.128739,-2.1414 -7.7787516,-5.715 -0.9011021,-4.9541 3.0078976,-9.4007 7.7787516,-10.16 6.351617,-1.0109 11.989963,4.0189 12.858753,10.16 1.120719,7.9219 -5.174398,14.8966 -12.858753,15.875 -8.7675197,0 -15.87499854,-7.1075 -15.87500066,-15.875 0.97840286,7.6843 7.95310306,13.9795 15.87500466,12.8587 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 28.858747,1036.3622 c -0.868791,-6.1411 -6.50714,-11.1709 -12.858757,-10.16 -4.770852,0.7593 -8.6798511,5.2059 -7.7787478,10.16 0.6500135,3.5736 4.0496108,6.5063 7.7787528,5.715 2.549442,-0.541 4.650357,-3.0384 3.96875,-5.715 -0.432467,-1.6983 -2.172491,-3.1118 -3.968752,-2.54 -1.020138,0.3247 -1.890193,1.4527 -1.428749,2.54 0.218502,0.5148 0.880518,0.984 1.42875,0.635 0.181931,-0.1159 0.385743,-0.4568 0.15875,-0.635 -0.01981,-0.016 -0.15875,-0.071 -0.15875,0 -0.07047,0 -0.01556,-0.139 0,-0.1588 0.178279,-0.227 0.519179,-0.023 0.635,0.1588 0.349015,0.5482 -0.120165,1.2102 -0.635,1.4287 -1.087249,0.4615 -2.215281,-0.4086 -2.540001,-1.4287 -0.571768,-1.7963 0.841712,-3.5363 2.540001,-3.9688 2.676659,-0.6816 5.173994,1.4193 5.715002,3.9688 0.791348,3.7291 -2.141372,7.1287 -5.715002,7.7787 -4.954066,0.9011 -9.4006965,-3.0079 -10.1600022,-7.7787 -1.0108916,-6.3516 4.0189028,-11.99 10.1600022,-12.8588 7.9219,-1.1207 14.896598,5.1744 15.875,12.8588 -2e-6,8.7675 -7.107482,15.875 -15.874997,15.875 7.684356,-0.9784 13.979471,-7.9531 12.85875,-15.875 z"
+       style="opacity:1;fill:#f30c0c;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5604"
+       inkscape:transform-center-x="2.2511626"
+       inkscape:transform-center-y="-3.3547158" />
+    <path
+       inkscape:transform-center-y="2.2511879"
+       inkscape:transform-center-x="3.3547205"
+       id="path5608"
+       style="opacity:1;fill:#f0f0f0;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 15.999998,1023.5034 c -6.1410992,0.8688 -11.1708915,6.5072 -10.1599977,12.8588 0.7593067,4.7708 5.2059377,8.6798 10.1600047,7.7787 3.573629,-0.65 6.506348,-4.0496 5.714999,-7.7787 -0.541008,-2.5495 -3.038345,-4.6504 -5.715004,-3.9688 -1.698287,0.4325 -3.111767,2.1725 -2.539999,3.9688 0.32472,1.0201 1.452753,1.8902 2.540001,1.4287 0.514836,-0.2185 0.984016,-0.8805 0.635,-1.4287 -0.11582,-0.182 -0.45672,-0.3858 -0.635,-0.1588 -0.01556,0.02 -0.07047,0.1588 0,0.1588 0,0.07 -0.138943,0.015 -0.15875,0 -0.226993,-0.1783 -0.02318,-0.5192 0.15875,-0.635 0.548232,-0.349 1.210247,0.1201 1.42875,0.635 0.461443,1.0872 -0.408612,2.2153 -1.42875,2.54 -1.796262,0.5717 -3.536285,-0.8417 -3.968751,-2.54 -0.681606,-2.6767 1.419309,-5.174 3.968751,-5.715 3.729142,-0.7914 7.128739,2.1413 7.778751,5.715 0.901103,4.954 -3.007897,9.4007 -7.778751,10.16 -6.3516162,1.0109 -11.989964,-4.0189 -12.858752,-10.16 -1.1207202,-7.9219 5.1743956,-14.8966 12.858752,-15.875 8.767519,0 15.874998,7.1075 15.875,15.875 -0.978404,-7.6844 -7.953104,-13.9795 -15.875004,-12.8588 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 3.1412562,1036.3622 c 0.8687892,6.1411 6.5071392,11.1709 12.8587558,10.16 4.770852,-0.7593 8.679851,-5.206 7.778746,-10.16 -0.650012,-3.5737 -4.049609,-6.5064 -7.778751,-5.715 -2.549442,0.541 -4.650357,3.0383 -3.96875,5.715 0.432466,1.6983 2.172491,3.1117 3.968752,2.54 1.020138,-0.3248 1.890193,-1.4528 1.428749,-2.54 -0.218503,-0.5149 -0.880519,-0.9841 -1.42875,-0.635 -0.181931,0.1158 -0.385743,0.4567 -0.15875,0.635 0.01981,0.015 0.15875,0.07 0.15875,0 0.07048,0 0.01556,0.1389 0,0.1587 -0.178279,0.227 -0.519179,0.023 -0.635,-0.1587 -0.349015,-0.5483 0.120165,-1.2103 0.635,-1.4288 1.087249,-0.4614 2.215281,0.4086 2.540001,1.4288 0.571768,1.7962 -0.841712,3.5362 -2.540001,3.9687 -2.676659,0.6816 -5.173993,-1.4193 -5.715001,-3.9687 -0.7913485,-3.7292 2.141372,-7.1288 5.715001,-7.7788 4.954065,-0.9011 9.400696,3.0079 10.160003,7.7788 1.01089,6.3516 -4.018904,11.9899 -10.160003,12.8587 -7.9219012,1.1208 -14.8965994,-5.1744 -15.87500014,-12.8587 2.11e-6,-8.7676 7.10748094,-15.875 15.87499714,-15.875 -7.6843573,0.9784 -13.979472,7.9531 -12.8587488,15.875 z"
+       style="opacity:1;fill:#0be50b;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5610"
+       inkscape:transform-center-x="-2.251162"
+       inkscape:transform-center-y="3.3547318" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99951941;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path7011"
+       cx="16"
+       cy="1036.3622"
+       r="15.50024" />
+    <circle
+       style="opacity:1;fill:#9e4d00;fill-opacity:1;stroke:#643100;stroke-width:1.00036621;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path7017"
+       cx="16"
+       cy="1036.3622"
+       r="1.4998169" />
+  </g>
+</svg>
diff --git a/src/assets/kaylee_small_gray.svg b/src/assets/kaylee_small_gray.svg
new file mode 100644
index 0000000..36b3bd8
--- /dev/null
+++ b/src/assets/kaylee_small_gray.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="0.91 r13725"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 32 32"
+   height="32"
+   width="32"
+   sodipodi:docname="kaylee_small_gray.svg"
+   inkscape:export-filename="/home/clay/kaylee/data/icon_inactive_small.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="14.308741"
+     inkscape:cx="-10.927648"
+     inkscape:zoom="11.313708"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5639"
+       empspacing="4"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       id="circle5600"
+       style="opacity:1;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 16.000003,1049.2209 c 6.141098,-0.8688 11.17089,-6.5071 10.159998,-12.8587 -0.759308,-4.7709 -5.205939,-8.6799 -10.160006,-7.7788 -3.573628,0.65 -6.5063471,4.0496 -5.714997,7.7788 0.541008,2.5494 3.038343,4.6503 5.715002,3.9687 1.698289,-0.4324 3.111768,-2.1725 2.539999,-3.9687 -0.324719,-1.0202 -1.452752,-1.8902 -2.54,-1.4288 -0.514836,0.2185 -0.984016,0.8805 -0.635,1.4288 0.11582,0.1819 0.45672,0.3857 0.635,0.1587 0.01556,-0.02 0.07048,-0.1587 0,-0.1587 0,-0.071 0.138943,-0.016 0.15875,0 0.226993,0.1782 0.02318,0.5191 -0.15875,0.635 -0.548232,0.349 -1.210248,-0.1202 -1.42875,-0.635 -0.461444,-1.0873 0.408613,-2.2153 1.42875,-2.54 1.796261,-0.5718 3.536284,0.8417 3.968751,2.54 0.681606,2.6766 -1.41931,5.174 -3.968751,5.715 -3.729143,0.7913 -7.128739,-2.1414 -7.7787516,-5.715 -0.9011021,-4.9541 3.0078976,-9.4007 7.7787516,-10.16 6.351617,-1.0109 11.989963,4.0189 12.858753,10.16 1.120719,7.9219 -5.174398,14.8966 -12.858753,15.875 -8.7675197,0 -15.87499854,-7.1075 -15.87500066,-15.875 0.97840286,7.6843 7.95310306,13.9795 15.87500466,12.8587 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 28.858747,1036.3622 c -0.868791,-6.1411 -6.50714,-11.1709 -12.858757,-10.16 -4.770852,0.7593 -8.6798511,5.2059 -7.7787478,10.16 0.6500135,3.5736 4.0496108,6.5063 7.7787528,5.715 2.549442,-0.541 4.650357,-3.0384 3.96875,-5.715 -0.432467,-1.6983 -2.172491,-3.1118 -3.968752,-2.54 -1.020138,0.3247 -1.890193,1.4527 -1.428749,2.54 0.218502,0.5148 0.880518,0.984 1.42875,0.635 0.181931,-0.1159 0.385743,-0.4568 0.15875,-0.635 -0.01981,-0.016 -0.15875,-0.071 -0.15875,0 -0.07047,0 -0.01556,-0.139 0,-0.1588 0.178279,-0.227 0.519179,-0.023 0.635,0.1588 0.349015,0.5482 -0.120165,1.2102 -0.635,1.4287 -1.087249,0.4615 -2.215281,-0.4086 -2.540001,-1.4287 -0.571768,-1.7963 0.841712,-3.5363 2.540001,-3.9688 2.676659,-0.6816 5.173994,1.4193 5.715002,3.9688 0.791348,3.7291 -2.141372,7.1287 -5.715002,7.7787 -4.954066,0.9011 -9.4006965,-3.0079 -10.1600022,-7.7787 -1.0108916,-6.3516 4.0189028,-11.99 10.1600022,-12.8588 7.9219,-1.1207 14.896598,5.1744 15.875,12.8588 -2e-6,8.7675 -7.107482,15.875 -15.874997,15.875 7.684356,-0.9784 13.979471,-7.9531 12.85875,-15.875 z"
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5604"
+       inkscape:transform-center-x="2.2511626"
+       inkscape:transform-center-y="-3.3547158" />
+    <path
+       inkscape:transform-center-y="2.2511879"
+       inkscape:transform-center-x="3.3547205"
+       id="path5608"
+       style="opacity:1;fill:#f0f0f0;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 15.999998,1023.5034 c -6.1410992,0.8688 -11.1708915,6.5072 -10.1599977,12.8588 0.7593067,4.7708 5.2059377,8.6798 10.1600047,7.7787 3.573629,-0.65 6.506348,-4.0496 5.714999,-7.7787 -0.541008,-2.5495 -3.038345,-4.6504 -5.715004,-3.9688 -1.698287,0.4325 -3.111767,2.1725 -2.539999,3.9688 0.32472,1.0201 1.452753,1.8902 2.540001,1.4287 0.514836,-0.2185 0.984016,-0.8805 0.635,-1.4287 -0.11582,-0.182 -0.45672,-0.3858 -0.635,-0.1588 -0.01556,0.02 -0.07047,0.1588 0,0.1588 0,0.07 -0.138943,0.015 -0.15875,0 -0.226993,-0.1783 -0.02318,-0.5192 0.15875,-0.635 0.548232,-0.349 1.210247,0.1201 1.42875,0.635 0.461443,1.0872 -0.408612,2.2153 -1.42875,2.54 -1.796262,0.5717 -3.536285,-0.8417 -3.968751,-2.54 -0.681606,-2.6767 1.419309,-5.174 3.968751,-5.715 3.729142,-0.7914 7.128739,2.1413 7.778751,5.715 0.901103,4.954 -3.007897,9.4007 -7.778751,10.16 -6.3516162,1.0109 -11.989964,-4.0189 -12.858752,-10.16 -1.1207202,-7.9219 5.1743956,-14.8966 12.858752,-15.875 8.767519,0 15.874998,7.1075 15.875,15.875 -0.978404,-7.6844 -7.953104,-13.9795 -15.875004,-12.8588 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssscccssssssssccs" />
+    <path
+       sodipodi:nodetypes="sssssssscccssssssssccs"
+       inkscape:connector-curvature="0"
+       d="m 3.1412562,1036.3622 c 0.8687892,6.1411 6.5071392,11.1709 12.8587558,10.16 4.770852,-0.7593 8.679851,-5.206 7.778746,-10.16 -0.650012,-3.5737 -4.049609,-6.5064 -7.778751,-5.715 -2.549442,0.541 -4.650357,3.0383 -3.96875,5.715 0.432466,1.6983 2.172491,3.1117 3.968752,2.54 1.020138,-0.3248 1.890193,-1.4528 1.428749,-2.54 -0.218503,-0.5149 -0.880519,-0.9841 -1.42875,-0.635 -0.181931,0.1158 -0.385743,0.4567 -0.15875,0.635 0.01981,0.015 0.15875,0.07 0.15875,0 0.07048,0 0.01556,0.1389 0,0.1587 -0.178279,0.227 -0.519179,0.023 -0.635,-0.1587 -0.349015,-0.5483 0.120165,-1.2103 0.635,-1.4288 1.087249,-0.4614 2.215281,0.4086 2.540001,1.4288 0.571768,1.7962 -0.841712,3.5362 -2.540001,3.9687 -2.676659,0.6816 -5.173993,-1.4193 -5.715001,-3.9687 -0.7913485,-3.7292 2.141372,-7.1288 5.715001,-7.7788 4.954065,-0.9011 9.400696,3.0079 10.160003,7.7788 1.01089,6.3516 -4.018904,11.9899 -10.160003,12.8587 -7.9219012,1.1208 -14.8965994,-5.1744 -15.87500014,-12.8587 2.11e-6,-8.7676 7.10748094,-15.875 15.87499714,-15.875 -7.6843573,0.9784 -13.979472,7.9531 -12.8587488,15.875 z"
+       style="opacity:1;fill:#969696;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5610"
+       inkscape:transform-center-x="-2.251162"
+       inkscape:transform-center-y="3.3547318" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99951941;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path7011"
+       cx="16"
+       cy="1036.3622"
+       r="15.50024" />
+    <circle
+       style="opacity:1;fill:#323232;fill-opacity:1;stroke:#232323;stroke-width:1.00036621;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path7017"
+       cx="16"
+       cy="1036.3622"
+       r="1.4998169" />
+  </g>
+</svg>
diff --git a/src/data/icon.png b/src/data/icon.png
new file mode 100644
index 0000000..1569cb3
--- /dev/null
+++ b/src/data/icon.png
Binary files differdiff --git a/src/data/icon_inactive.png b/src/data/icon_inactive.png
new file mode 100644
index 0000000..0f67bb4
--- /dev/null
+++ b/src/data/icon_inactive.png
Binary files differdiff --git a/src/data/icon_inactive_small.png b/src/data/icon_inactive_small.png
new file mode 100644
index 0000000..1d4e7ff
--- /dev/null
+++ b/src/data/icon_inactive_small.png
Binary files differdiff --git a/src/data/icon_small.png b/src/data/icon_small.png
new file mode 100644
index 0000000..3caa172
--- /dev/null
+++ b/src/data/icon_small.png
Binary files differdiff --git a/src/kaylee.py b/src/kaylee.py
new file mode 100755
index 0000000..082d6b6
--- /dev/null
+++ b/src/kaylee.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+# This is part of Kaylee
+# -- this code is licensed GPLv3
+# Copyright 2015-2016 Clayton G. Hobbs
+# Portions Copyright 2013 Jezra
+
+from kayleevc import kaylee
+
+if __name__ == '__main__':
+    kaylee.run()
diff --git a/src/kayleevc/__init__.py b/src/kayleevc/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/kayleevc/__init__.py
diff --git a/src/kayleevc/gui.py b/src/kayleevc/gui.py
new file mode 100644
index 0000000..27085a8
--- /dev/null
+++ b/src/kayleevc/gui.py
@@ -0,0 +1,213 @@
+# This is part of Kaylee
+# -- this code is licensed GPLv3
+# Copyright 2015-2016 Clayton G. Hobbs
+# Portions Copyright 2013 Jezra
+
+import sys
+import gi
+from gi.repository import GObject
+# Gtk
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk, Gdk
+
+
+class GTKTrayInterface(GObject.GObject):
+    __gsignals__ = {
+        'command' : (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE,
+                     (GObject.TYPE_STRING,))
+    }
+    idle_text = "Kaylee - Idle"
+    listening_text = "Kaylee - Listening"
+
+    def __init__(self, args, continuous):
+        GObject.GObject.__init__(self)
+        self.continuous = continuous
+
+        self.statusicon = Gtk.StatusIcon()
+        self.statusicon.set_title("Kaylee")
+        self.statusicon.set_name("Kaylee")
+        self.statusicon.set_tooltip_text(self.idle_text)
+        self.statusicon.set_has_tooltip(True)
+        self.statusicon.connect("activate", self.continuous_toggle)
+        self.statusicon.connect("popup-menu", self.popup_menu)
+
+        self.menu = Gtk.Menu()
+        self.menu_listen = Gtk.MenuItem('Listen')
+        self.menu_continuous = Gtk.CheckMenuItem('Continuous')
+        self.menu_quit = Gtk.MenuItem('Quit')
+        self.menu.append(self.menu_listen)
+        self.menu.append(self.menu_continuous)
+        self.menu.append(self.menu_quit)
+        self.menu_listen.connect("activate", self.toggle_listen)
+        self.menu_continuous.connect("toggled", self.toggle_continuous)
+        self.menu_quit.connect("activate", self.quit)
+        self.menu.show_all()
+
+    def continuous_toggle(self, item):
+        checked = self.menu_continuous.get_active()
+        self.menu_continuous.set_active(not checked)
+
+    def toggle_continuous(self, item):
+        checked = self.menu_continuous.get_active()
+        self.menu_listen.set_sensitive(not checked)
+        if checked:
+            self.menu_listen.set_label("Listen")
+            self.emit('command', "continuous_listen")
+            self.statusicon.set_tooltip_text(self.listening_text)
+            self.set_icon_active()
+        else:
+            self.set_icon_inactive()
+            self.statusicon.set_tooltip_text(self.idle_text)
+            self.emit('command', "continuous_stop")
+
+    def toggle_listen(self, item):
+        val = self.menu_listen.get_label()
+        if val == "Listen":
+            self.set_icon_active()
+            self.emit("command", "listen")
+            self.menu_listen.set_label("Stop")
+            self.statusicon.set_tooltip_text(self.listening_text)
+        else:
+            self.set_icon_inactive()
+            self.menu_listen.set_label("Listen")
+            self.emit("command", "stop")
+            self.statusicon.set_tooltip_text(self.idle_text)
+
+    def popup_menu(self, item, button, time):
+        self.menu.popup(None, None, Gtk.StatusIcon.position_menu, item, button, time)
+
+    def run(self):
+        # Set the icon
+        self.set_icon_inactive()
+        if self.continuous:
+            self.menu_continuous.set_active(True)
+            self.set_icon_active()
+        else:
+            self.menu_continuous.set_active(False)
+        self.statusicon.set_visible(True)
+
+    def quit(self, item):
+        self.statusicon.set_visible(False)
+        self.emit("command", "quit")
+
+    def finished(self, text):
+        if not self.menu_continuous.get_active():
+            self.menu_listen.set_label("Listen")
+            self.set_icon_inactive()
+            self.statusicon.set_tooltip_text(self.idle_text)
+
+    def set_icon_active_asset(self, i):
+        self.icon_active = i
+
+    def set_icon_inactive_asset(self, i):
+        self.icon_inactive = i
+
+    def set_icon_active(self):
+        self.statusicon.set_from_file(self.icon_active)
+
+    def set_icon_inactive(self):
+        self.statusicon.set_from_file(self.icon_inactive)
+
+
+class GTKInterface(GObject.GObject):
+    __gsignals__ = {
+        'command': (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE,
+                    (GObject.TYPE_STRING,))
+    }
+
+    def __init__(self, args, continuous):
+        GObject.GObject.__init__(self)
+        self.continuous = continuous
+        # Make a window
+        self.window = Gtk.Window(Gtk.WindowType.TOPLEVEL)
+        self.window.connect("delete_event", self.delete_event)
+        # Give the window a name
+        self.window.set_title("Kaylee")
+        self.window.set_resizable(False)
+
+        layout = Gtk.VBox()
+        self.window.add(layout)
+        # Make a listen/stop button
+        self.lsbutton = Gtk.Button("Listen")
+        layout.add(self.lsbutton)
+        # Make a continuous button
+        self.ccheckbox = Gtk.CheckButton("Continuous Listen")
+        layout.add(self.ccheckbox)
+
+        # Connect the buttons
+        self.lsbutton.connect("clicked", self.lsbutton_clicked)
+        self.ccheckbox.connect("clicked", self.ccheckbox_clicked)
+
+        # Add a label to the UI to display the last command
+        self.label = Gtk.Label()
+        layout.add(self.label)
+
+        # Create an accellerator group for this window
+        accel = Gtk.AccelGroup()
+        # Add the ctrl+q to quit
+        accel.connect(Gdk.keyval_from_name('q'), Gdk.ModifierType.CONTROL_MASK,
+                Gtk.AccelFlags.VISIBLE, self.accel_quit)
+        # Lock the group
+        accel.lock()
+        # Add the group to the window
+        self.window.add_accel_group(accel)
+
+    def ccheckbox_clicked(self, widget):
+        checked = self.ccheckbox.get_active()
+        self.lsbutton.set_sensitive(not checked)
+        if checked:
+            self.lsbutton_stopped()
+            self.emit('command', "continuous_listen")
+            self.set_icon_active()
+        else:
+            self.emit('command', "continuous_stop")
+            self.set_icon_inactive()
+
+    def lsbutton_stopped(self):
+        self.lsbutton.set_label("Listen")
+
+    def lsbutton_clicked(self, button):
+        val = self.lsbutton.get_label()
+        if val == "Listen":
+            self.emit("command", "listen")
+            self.lsbutton.set_label("Stop")
+            # Clear the label
+            self.label.set_text("")
+            self.set_icon_active()
+        else:
+            self.lsbutton_stopped()
+            self.emit("command", "stop")
+            self.set_icon_inactive()
+
+    def run(self):
+        # Set the default icon
+        self.set_icon_inactive()
+        self.window.show_all()
+        if self.continuous:
+            self.set_icon_active()
+            self.ccheckbox.set_active(True)
+
+    def accel_quit(self, accel_group, acceleratable, keyval, modifier):
+        self.emit("command", "quit")
+
+    def delete_event(self, x, y):
+        self.emit("command", "quit")
+
+    def finished(self, text):
+        # If the continuous isn't pressed
+        if not self.ccheckbox.get_active():
+            self.lsbutton_stopped()
+            self.set_icon_inactive()
+        self.label.set_text(text)
+
+    def set_icon_active_asset(self, i):
+        self.icon_active = i
+
+    def set_icon_inactive_asset(self, i):
+        self.icon_inactive = i
+
+    def set_icon_active(self):
+        Gtk.Window.set_default_icon_from_file(self.icon_active)
+
+    def set_icon_inactive(self):
+        Gtk.Window.set_default_icon_from_file(self.icon_inactive)
diff --git a/src/kayleevc/kaylee.py b/src/kayleevc/kaylee.py
new file mode 100644
index 0000000..4e99d1a
--- /dev/null
+++ b/src/kayleevc/kaylee.py
@@ -0,0 +1,207 @@
+# This is part of Kaylee
+# -- this code is licensed GPLv3
+# Copyright 2015-2016 Clayton G. Hobbs
+# Portions Copyright 2013 Jezra
+
+import sys
+import signal
+import os.path
+import subprocess
+from gi.repository import GObject, GLib
+
+from kayleevc.recognizer import Recognizer
+from kayleevc.util import *
+from kayleevc.numbers import NumberParser
+
+
+class Kaylee:
+
+    def __init__(self):
+        self.ui = None
+        self.options = {}
+        self.continuous_listen = False
+
+        # Load configuration
+        self.config = Config()
+        self.options = vars(self.config.options)
+        self.commands = self.options['commands']
+
+        # Create number parser for later use
+        self.number_parser = NumberParser()
+
+        # Create a hasher
+        self.hasher = Hasher(self.config)
+
+        # Create the strings file
+        self.update_voice_commands_if_changed()
+
+        if self.options['interface']:
+            if self.options['interface'] == "g":
+                from kayleevc.gui import GTKInterface as UI
+            elif self.options['interface'] == "gt":
+                from kayleevc.gui import GTKTrayInterface as UI
+            else:
+                print("no GUI defined")
+                sys.exit()
+
+            self.ui = UI(self.options, self.options['continuous'])
+            self.ui.connect("command", self.process_command)
+            # Can we load the icon resource?
+            icon = self.load_resource("icon_small.png")
+            if icon:
+                self.ui.set_icon_active_asset(icon)
+            # Can we load the icon_inactive resource?
+            icon_inactive = self.load_resource("icon_inactive_small.png")
+            if icon_inactive:
+                self.ui.set_icon_inactive_asset(icon_inactive)
+
+        if self.options['history']:
+            self.history = []
+
+        # Update the language if necessary
+        self.language_updater = LanguageUpdater(self.config)
+        self.language_updater.update_language_if_changed()
+
+        # Create the recognizer
+        self.recognizer = Recognizer(self.config)
+        self.recognizer.connect('finished', self.recognizer_finished)
+
+    def update_voice_commands_if_changed(self):
+        """Use hashes to test if the voice commands have changed"""
+        stored_hash = self.hasher['voice_commands']
+
+        # Calculate the hash the voice commands have right now
+        hasher = self.hasher.get_hash_object()
+        for voice_cmd in self.commands.keys():
+            hasher.update(voice_cmd.encode('utf-8'))
+            # Add a separator to avoid odd behavior
+            hasher.update('\n'.encode('utf-8'))
+        new_hash = hasher.hexdigest()
+
+        if new_hash != stored_hash:
+            self.create_strings_file()
+            self.hasher['voice_commands'] = new_hash
+            self.hasher.store()
+
+    def create_strings_file(self):
+        # Open the strings file
+        with open(self.config.strings_file, 'w') as strings:
+            # Add command words to the corpus
+            for voice_cmd in sorted(self.commands.keys()):
+                strings.write(voice_cmd.strip().replace('%d', '') + "\n")
+            # Add number words to the corpus
+            for word in self.number_parser.number_words:
+                strings.write(word + " ")
+            strings.write("\n")
+
+    def log_history(self, text):
+        if self.options['history']:
+            self.history.append(text)
+            if len(self.history) > self.options['history']:
+                # Pop off the first item
+                self.history.pop(0)
+
+            # Open and truncate the history file
+            with open(self.config.history_file, 'w') as hfile:
+                for line in self.history:
+                    hfile.write(line + '\n')
+
+    def run_command(self, cmd):
+        """Print the command, then run it"""
+        print(cmd)
+        subprocess.call(cmd, shell=True)
+
+    def recognizer_finished(self, recognizer, text):
+        t = text.lower()
+        numt, nums = self.number_parser.parse_all_numbers(t)
+        # Is there a matching command?
+        if t in self.commands:
+            # Run the valid_sentence_command if it's set
+            if self.options['valid_sentence_command']:
+                subprocess.call(self.options['valid_sentence_command'],
+                                shell=True)
+            cmd = self.commands[t]
+            # Should we be passing words?
+            if self.options['pass_words']:
+                cmd += " " + t
+            self.run_command(cmd)
+            self.log_history(text)
+        elif numt in self.commands:
+            # Run the valid_sentence_command if it's set
+            if self.options['valid_sentence_command']:
+                subprocess.call(self.options['valid_sentence_command'],
+                                shell=True)
+            cmd = self.commands[numt]
+            cmd = cmd.format(*nums)
+            # Should we be passing words?
+            if self.options['pass_words']:
+                cmd += " " + t
+            self.run_command(cmd)
+            self.log_history(text)
+        else:
+            # Run the invalid_sentence_command if it's set
+            if self.options['invalid_sentence_command']:
+                subprocess.call(self.options['invalid_sentence_command'],
+                                shell=True)
+            print("no matching command {0}".format(t))
+        # If there is a UI and we are not continuous listen
+        if self.ui:
+            if not self.continuous_listen:
+                # Stop listening
+                self.recognizer.pause()
+            # Let the UI know that there is a finish
+            self.ui.finished(t)
+
+    def run(self):
+        if self.ui:
+            self.ui.run()
+        else:
+            self.recognizer.listen()
+
+    def quit(self):
+        sys.exit()
+
+    def process_command(self, UI, command):
+        print(command)
+        if command == "listen":
+            self.recognizer.listen()
+        elif command == "stop":
+            self.recognizer.pause()
+        elif command == "continuous_listen":
+            self.continuous_listen = True
+            self.recognizer.listen()
+        elif command == "continuous_stop":
+            self.continuous_listen = False
+            self.recognizer.pause()
+        elif command == "quit":
+            self.quit()
+
+    def load_resource(self, string):
+        # TODO: Use the Config object for this path management
+        local_data = os.path.join(os.path.dirname(__file__), '..', 'data')
+        paths = ["/usr/share/kaylee/", "/usr/local/share/kaylee", local_data]
+        for path in paths:
+            resource = os.path.join(path, string)
+            if os.path.exists(resource):
+                return resource
+        # If we get this far, no resource was found
+        return False
+
+
+def run():
+    # Make our kaylee object
+    kaylee = Kaylee()
+    # Init gobject threads
+    GObject.threads_init()
+    # We want a main loop
+    main_loop = GObject.MainLoop()
+    # Handle sigint
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
+    # Run the kaylee
+    kaylee.run()
+    # Start the main loop
+    try:
+        main_loop.run()
+    except:
+        main_loop.quit()
+        sys.exit()
diff --git a/src/kayleevc/numbers.py b/src/kayleevc/numbers.py
new file mode 100644
index 0000000..be0036f
--- /dev/null
+++ b/src/kayleevc/numbers.py
@@ -0,0 +1,183 @@
+#!/usr/bin/env python
+# This is part of Kaylee
+# -- this code is licensed GPLv3
+# Copyright 2015-2016 Clayton G. Hobbs
+# Portions Copyright 2013 Jezra
+
+import re
+
+
+class NumberParser:
+    """Parses integers from English strings"""
+
+    zero = {
+        'zero': 0
+    }
+
+    ones = {
+        'one': 1,
+        'two': 2,
+        'three': 3,
+        'four': 4,
+        'five': 5,
+        'six': 6,
+        'seven': 7,
+        'eight': 8,
+        'nine': 9
+    }
+
+    special_ones = {
+        'ten': 10,
+        'eleven': 11,
+        'twelve': 12,
+        'thirteen': 13,
+        'fourteen': 14,
+        'fifteen': 15,
+        'sixteen': 16,
+        'seventeen': 17,
+        'eighteen': 18,
+        'ninteen': 19
+    }
+
+    tens = {
+        'twenty': 20,
+        'thirty': 30,
+        'forty': 40,
+        'fifty': 50,
+        'sixty': 60,
+        'seventy': 70,
+        'eighty': 80,
+        'ninty': 90
+    }
+
+    hundred = {
+        'hundred': 100
+    }
+
+    exp = {
+        'thousand': 1000,
+        'million': 1000000,
+        'billion': 1000000000
+    }
+
+    allowed = [
+        'and'
+    ]
+
+    def __init__(self):
+        self.number_words = []
+        for word in sorted(self.zero.keys()):
+            self.number_words.append(word)
+        for word in sorted(self.ones.keys()):
+            self.number_words.append(word)
+        for word in sorted(self.special_ones.keys()):
+            self.number_words.append(word)
+        for word in sorted(self.tens.keys()):
+            self.number_words.append(word)
+        for word in sorted(self.hundred.keys()):
+            self.number_words.append(word)
+        for word in sorted(self.exp.keys()):
+            self.number_words.append(word)
+        self.mandatory_number_words = self.number_words.copy()
+        for word in sorted(self.allowed):
+            self.number_words.append(word)
+
+    def parse_number(self, text_line):
+        """Parse a number from English into an int"""
+        value = 0
+        partial_value = 0
+        last_list = None
+
+        # Split text_line by commas, whitespace, and hyphens
+        text_line = text_line.strip()
+        text_words = re.split(r'[,\s-]+', text_line)
+        # Parse the number
+        for word in text_words:
+            if word in self.zero:
+                if last_list is not None:
+                    raise ValueError('Invalid number')
+                value = 0
+                last_list = self.zero
+            elif word in self.ones:
+                if last_list in (self.zero, self.ones, self.special_ones):
+                    raise ValueError('Invalid number')
+                value += self.ones[word]
+                last_list = self.ones
+            elif word in self.special_ones:
+                if last_list in (self.zero, self.ones, self.special_ones, self.tens):
+                    raise ValueError('Invalid number')
+                value += self.special_ones[word]
+                last_list = self.special_ones
+            elif word in self.tens:
+                if last_list in (self.zero, self.ones, self.special_ones, self.tens):
+                    raise ValueError('Invalid number')
+                value += self.tens[word]
+                last_list = self.tens
+            elif word in self.hundred:
+                if last_list not in (self.ones, self.special_ones, self.tens):
+                    raise ValueError('Invalid number')
+                value *= self.hundred[word]
+                last_list = self.hundred
+            elif word in self.exp:
+                if last_list in (self.zero, self.exp):
+                    raise ValueError('Invalid number')
+                partial_value += value * self.exp[word]
+                value = 0
+                last_list = self.exp
+            elif word not in self.allowed:
+                raise ValueError('Invalid number')
+            # Debugging information
+            #print(word, value, partial_value)
+        # Finish parsing the number
+        value += partial_value
+        return value
+
+    def parse_all_numbers(self, text_line):
+        """
+        Parse all numbers from English to ints
+
+        Returns a tuple whose first element is text_line with all English
+        numbers replaced with "%d", and whose second element is a list
+        containing all the parsed numbers as ints.
+        """
+        nums = []
+        t_numless = ''
+
+        # Split text_line by commas, whitespace, and hyphens
+        text_words = re.split(r'[,\s-]+', text_line.strip())
+        # Get a string of word classes
+        tw_classes = ''
+        for word in text_words:
+            if word in self.mandatory_number_words:
+                tw_classes += 'm'
+            elif word in self.allowed:
+                tw_classes += 'a'
+            else:
+                tw_classes += 'w'
+
+        # For each string of number words:
+        last_end = 0
+        for m in re.finditer('m[am]*m|m', tw_classes):
+            # Get the number words
+            num_words = ' '.join(text_words[m.start():m.end()])
+            # Parse the number and store the value
+            try:
+                nums.append(self.parse_number(num_words))
+            except ValueError:
+                nums.append(-1)
+            # Add words to t_numless
+            t_numless += ' '.join(text_words[last_end:m.start()]) + ' %d '
+            last_end = m.end()
+        t_numless += ' '.join(text_words[last_end:])
+
+        return (t_numless.strip(), nums)
+
+
+if __name__ == '__main__':
+    np = NumberParser()
+    # Get the words to translate
+    text_line = input('Enter a string: ')
+    # Parse it to an integer
+    value = np.parse_all_numbers(text_line)
+    # Print the result
+    print(value)
diff --git a/src/kayleevc/recognizer.py b/src/kayleevc/recognizer.py
new file mode 100644
index 0000000..09e14e4
--- /dev/null
+++ b/src/kayleevc/recognizer.py
@@ -0,0 +1,69 @@
+# This is part of Kaylee
+# -- this code is licensed GPLv3
+# Copyright 2015-2016 Clayton G. Hobbs
+# Portions Copyright 2013 Jezra
+
+import os.path
+import sys
+
+import gi
+gi.require_version('Gst', '1.0')
+from gi.repository import GObject, Gst
+GObject.threads_init()
+Gst.init(None)
+
+
+class Recognizer(GObject.GObject):
+    __gsignals__ = {
+        'finished' : (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE,
+                      (GObject.TYPE_STRING,))
+    }
+
+    def __init__(self, config):
+        GObject.GObject.__init__(self)
+        self.commands = {}
+
+        src = config.options.microphone
+        if src:
+            audio_src = 'alsasrc device="hw:{0},0"'.format(src)
+        else:
+            audio_src = 'autoaudiosrc'
+
+        # Build the pipeline
+        cmd = (
+            audio_src +
+            ' ! audioconvert' +
+            ' ! audioresample' +
+            ' ! pocketsphinx lm=' + config.lang_file + ' dict=' +
+            config.dic_file +
+            ' ! appsink sync=false'
+        )
+        try:
+            self.pipeline = Gst.parse_launch(cmd)
+        except Exception as e:
+            print(e.message)
+            print("You may need to install gstreamer1.0-pocketsphinx")
+            raise e
+
+        # Process results from the pipeline with self.result()
+        bus = self.pipeline.get_bus()
+        bus.add_signal_watch()
+        bus.connect('message::element', self.result)
+
+    def listen(self):
+        self.pipeline.set_state(Gst.State.PLAYING)
+
+    def pause(self):
+        self.pipeline.set_state(Gst.State.PAUSED)
+
+    def result(self, bus, msg):
+        msg_struct = msg.get_structure()
+        # Ignore messages that aren't from pocketsphinx
+        msgtype = msg_struct.get_name()
+        if msgtype != 'pocketsphinx':
+            return
+
+        # If we have a final command, send it for processing
+        command = msg_struct.get_string('hypothesis')
+        if command != '' and msg_struct.get_boolean('final')[1]:
+            self.emit("finished", command)
diff --git a/src/kayleevc/util.py b/src/kayleevc/util.py
new file mode 100644
index 0000000..7984dc3
--- /dev/null
+++ b/src/kayleevc/util.py
@@ -0,0 +1,204 @@
+# This is part of Kaylee
+# -- this code is licensed GPLv3
+# Copyright 2015-2016 Clayton G. Hobbs
+# Portions Copyright 2013 Jezra
+
+import re
+import json
+import hashlib
+import os
+from argparse import ArgumentParser, Namespace
+
+import requests
+
+from gi.repository import GLib
+
+
+class Config:
+    """Keep track of the configuration of Kaylee"""
+    # Name of the program, for later use
+    program_name = "kaylee"
+
+    # Directories
+    conf_dir = os.path.join(GLib.get_user_config_dir(), program_name)
+    cache_dir = os.path.join(GLib.get_user_cache_dir(), program_name)
+    data_dir = os.path.join(GLib.get_user_data_dir(), program_name)
+
+    # Configuration files
+    opt_file = os.path.join(conf_dir, "options.json")
+
+    # Cache files
+    history_file = os.path.join(cache_dir, program_name + "history")
+    hash_file = os.path.join(cache_dir, "hash.json")
+
+    # Data files
+    strings_file = os.path.join(data_dir, "sentences.corpus")
+    lang_file = os.path.join(data_dir, 'lm')
+    dic_file = os.path.join(data_dir, 'dic')
+
+    def __init__(self):
+        # Ensure necessary directories exist
+        self._make_dir(self.conf_dir)
+        self._make_dir(self.cache_dir)
+        self._make_dir(self.data_dir)
+
+        # Set up the argument parser
+        self._parser = ArgumentParser()
+        self._parser.add_argument("-i", "--interface", type=str,
+                dest="interface", action='store',
+                help="Interface to use (if any). 'g' for GTK or 'gt' for GTK" +
+                " system tray icon")
+
+        self._parser.add_argument("-c", "--continuous",
+                action="store_true", dest="continuous", default=False,
+                help="Start interface with 'continuous' listen enabled")
+
+        self._parser.add_argument("-p", "--pass-words",
+                action="store_true", dest="pass_words", default=False,
+                help="Pass the recognized words as arguments to the shell" +
+                " command")
+
+        self._parser.add_argument("-H", "--history", type=int,
+                action="store", dest="history",
+                help="Number of commands to store in history file")
+
+        self._parser.add_argument("-m", "--microphone", type=int,
+                action="store", dest="microphone", default=None,
+                help="Audio input card to use (if other than system default)")
+
+        self._parser.add_argument("--valid-sentence-command", type=str,
+                dest="valid_sentence_command", action='store',
+                help="Command to run when a valid sentence is detected")
+
+        self._parser.add_argument("--invalid-sentence-command", type=str,
+                dest="invalid_sentence_command", action='store',
+                help="Command to run when an invalid sentence is detected")
+
+        # Read the configuration file
+        self._read_options_file()
+
+        # Parse command-line arguments, overriding config file as appropriate
+        self._parser.parse_args(namespace=self.options)
+
+    def _make_dir(self, directory):
+        if not os.path.exists(directory):
+            os.makedirs(directory)
+
+    def _read_options_file(self):
+        try:
+            with open(self.opt_file, 'r') as f:
+                self.options = json.load(f)
+                self.options = Namespace(**self.options)
+        except FileNotFoundError:
+            # Make an empty options namespace
+            self.options = Namespace()
+
+
+class Hasher:
+    """Keep track of hashes for Kaylee"""
+
+    def __init__(self, config):
+        self.config = config
+        try:
+            with open(self.config.hash_file, 'r') as f:
+                self.hashes = json.load(f)
+        except IOError:
+            # No stored hash
+            self.hashes = {}
+
+    def __getitem__(self, hashname):
+        try:
+            return self.hashes[hashname]
+        except (KeyError, TypeError):
+            return None
+
+    def __setitem__(self, hashname, value):
+        self.hashes[hashname] = value
+
+    def get_hash_object(self):
+        """Returns an object to compute a new hash"""
+        return hashlib.sha256()
+
+    def store(self):
+        """Store the current hashes into a the hash file"""
+        with open(self.config.hash_file, 'w') as f:
+            json.dump(self.hashes, f)
+
+
+class LanguageUpdater:
+    """
+    Handles updating the language using the online lmtool.
+
+    This class provides methods to check if the corpus has changed, and to
+    update the language to match the new corpus using the lmtool.  This allows
+    us to automatically update the language if the corpus has changed, saving
+    the user from having to do this manually.
+    """
+
+    def __init__(self, config):
+        self.config = config
+        self.hasher = Hasher(config)
+
+    def update_language_if_changed(self):
+        """Test if the language has changed, and if it has, update it"""
+        if self.language_has_changed():
+            self.update_language()
+            self.save_language_hash()
+
+    def language_has_changed(self):
+        """Use hashes to test if the language has changed"""
+        self.stored_hash = self.hasher['language']
+
+        # Calculate the hash the language file has right now
+        hasher = self.hasher.get_hash_object()
+        with open(self.config.strings_file, 'rb') as sfile:
+            buf = sfile.read()
+            hasher.update(buf)
+        self.new_hash = hasher.hexdigest()
+
+        return self.new_hash != self.stored_hash
+
+    def update_language(self):
+        """Update the language using the online lmtool"""
+        print('Updating language using online lmtool')
+
+        host = 'http://www.speech.cs.cmu.edu'
+        url = host + '/cgi-bin/tools/lmtool/run'
+
+        # Submit the corpus to the lmtool
+        response_text = ""
+        with open(self.config.strings_file, 'rb') as corpus:
+            files = {'corpus': corpus}
+            values = {'formtype': 'simple'}
+
+            r = requests.post(url, files=files, data=values)
+            response_text = r.text
+
+        # Parse response to get URLs of the files we need
+        path_re = r'.*<title>Index of (.*?)</title>.*'
+        number_re = r'.*TAR([0-9]*?)\.tgz.*'
+        for line in response_text.split('\n'):
+            # If we found the directory, keep it and don't break
+            if re.search(path_re, line):
+                path = host + re.sub(path_re, r'\1', line)
+            # If we found the number, keep it and break
+            elif re.search(number_re, line):
+                number = re.sub(number_re, r'\1', line)
+                break
+
+        lm_url = path + '/' + number + '.lm'
+        dic_url = path + '/' + number + '.dic'
+
+        self._download_file(lm_url, self.config.lang_file)
+        self._download_file(dic_url, self.config.dic_file)
+
+    def save_language_hash(self):
+        self.hasher['language'] = self.new_hash
+        self.hasher.store()
+
+    def _download_file(self, url, path):
+        r = requests.get(url, stream=True)
+        if r.status_code == 200:
+            with open(path, 'wb') as f:
+                for chunk in r:
+                    f.write(chunk)
diff --git a/src/options.json.tmp b/src/options.json.tmp
new file mode 100644
index 0000000..dfde1e5
--- /dev/null
+++ b/src/options.json.tmp
@@ -0,0 +1,12 @@
+{
+    "commands": {
+        "hello world": "echo \"hello world\"",
+        "start a %d minute timer": "(echo {0} minute timer started && sleep {0}m && echo {0} minute timer ended) &"
+    },
+    "continuous": false,
+    "history": null,
+    "microphone": null,
+    "interface": null,
+    "valid_sentence_command": null,
+    "invalid_sentence_command": null
+}
diff --git a/src/setup.py b/src/setup.py
new file mode 100644
index 0000000..34ba60c
--- /dev/null
+++ b/src/setup.py
@@ -0,0 +1,39 @@
+from setuptools import setup
+
+with open("README.rst") as file:
+    long_description = file.read()
+
+setup(
+    name = "KayleeVC",
+    version = "0.1.1",
+    author = "Clayton G. Hobbs",
+    author_email = "clay@lakeserv.net",
+    description = ("Somewhat fancy voice command recognition software"),
+    license = "GPLv3+",
+    keywords = "voice speech command control",
+    url = "https://github.com/Ratfink/kaylee",
+    packages = ['kayleevc'],
+    long_description = long_description,
+    classifiers = [
+        "Development Status :: 3 - Alpha",
+        "Environment :: X11 Applications :: GTK",
+        "Intended Audience :: End Users/Desktop",
+        "License :: OSI Approved :: GNU General Public License v3 or later "
+            "(GPLv3+)",
+        "Operating System :: POSIX :: Linux",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3.5",
+        "Topic :: Home Automation"
+    ],
+    install_requires=["requests"],
+    data_files = [
+        ("/usr/share/kaylee", ["data/icon_inactive.png", "data/icon.png",
+            "options.json.tmp"]),
+        ("/usr/lib/systemd/user", ["systemd/kaylee.service"])
+    ],
+    entry_points = {
+        "console_scripts": [
+            "kaylee=kayleevc.kaylee:run"
+        ]
+    }
+)
diff --git a/src/systemd/kaylee.service b/src/systemd/kaylee.service
new file mode 100644
index 0000000..51c5a04
--- /dev/null
+++ b/src/systemd/kaylee.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Somewhat fancy voice command recognition software
+
+[Service]
+ExecStart=/usr/bin/kaylee
+
+[Install]
+WantedBy=default.target