23 files changed, 1455 insertions, 1237 deletions

diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 00000000..dba13ed2
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are 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.
+
+  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.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  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 AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/README.md b/README.md
index ffb476dc..3d95d05f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@ genenetwork on github  (May 7, 2012 by Lei Yan and Rob Williams)
 
 www.genenetwork.org 
 
-Released under Affero General Public License 3 (AGPLv3)
+Released under Affero General Public License 3 (AGPLv3). See also
+LICENSE.txt
 
 For background see: http://en.wikipedia.org/wiki/Genenetwork
 
@@ -24,4 +25,4 @@ Funded by the National Institutes of Health and
 University of Tennessee Center for Integrative and Translational Genomics
 
 
-===========
\ No newline at end of file
+===========
diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py
index 1a5c19d9..6e35f00a 100644
--- a/wqflask/utility/tools.py
+++ b/wqflask/utility/tools.py
@@ -49,3 +49,21 @@ def pylmm_command(default=None):
     path = get_setting('PYLMM_PATH',default,guess,get_valid_path)
     pylmm_command = 'python '+path+'/pylmm_gn2/lmm.py'
     return path,pylmm_command
+
+def plink_command(default=None):
+    """
+    Return the path to the repository and the python command to call
+    """
+    def get_valid_path(path):
+        """Test for a valid repository"""
+        if path:
+            sys.stderr.write("Trying PLINK_PATH in "+path+"\n")
+        if path and os.path.isfile(path+'/plink'):
+            return path
+        else:
+            None
+
+    guess = os.environ.get('HOME')+'/plink'
+    path = get_setting('PLINK_PATH',default,guess,get_valid_path)
+    plink_command = path+'/plink'
+    return path,plink_command
\ No newline at end of file
diff --git a/wqflask/wqflask/do_search.py b/wqflask/wqflask/do_search.py
index a42503c1..cec71777 100755
--- a/wqflask/wqflask/do_search.py
+++ b/wqflask/wqflask/do_search.py
@@ -115,7 +115,7 @@ class MrnaAssaySearch(DoSearch):
 
     DoSearch.search_types['ProbeSet'] = "MrnaAssaySearch"
 
-    base_query = """SELECT ProbeSet.Name as TNAME,
+    base_query = """SELECT distinct ProbeSet.Name as TNAME,
                 0 as thistable,
                 ProbeSetXRef.Mean as TMEAN,
                 ProbeSetXRef.LRS as TLRS,
@@ -394,7 +394,7 @@ class GenotypeSearch(DoSearch):
 
         # This adds a clause to the query that matches the search term
         # against each field in search_fields (above)
-        fields_clause = []
+        where_clause = []
 
         if "'" not in self.search_term[0]:
             self.search_term = "[[:<:]]" + self.search_term[0] + "[[:>:]]"
diff --git a/wqflask/wqflask/interval_mapping/interval_mapping.py b/wqflask/wqflask/interval_mapping/interval_mapping.py
index 4b4b7f73..672a9401 100755
--- a/wqflask/wqflask/interval_mapping/interval_mapping.py
+++ b/wqflask/wqflask/interval_mapping/interval_mapping.py
@@ -74,6 +74,7 @@ class IntervalMapping(object):
         json.dumps(self.json_data, webqtlConfig.TMPDIR + json_filename)
         
         self.js_data = dict(
+            result_score_type = "LRS",
             manhattan_plot = self.manhattan_plot,
             additive = self.additive,
             chromosomes = chromosome_mb_lengths,
@@ -85,7 +86,10 @@ class IntervalMapping(object):
     def set_options(self, start_vars):
         """Sets various options (physical/genetic mapping, # permutations, which chromosome"""
         
-        self.num_permutations = int(start_vars['num_perm'])
+        if start_vars['num_perm'] == "":
+            self.num_permutations = 0
+        else:
+            self.num_permutations = int(start_vars['num_perm'])
         if start_vars['manhattan_plot'] == "true":
             self.manhattan_plot = True
         else:
diff --git a/wqflask/wqflask/marker_regression/marker_regression.py b/wqflask/wqflask/marker_regression/marker_regression.py
index 2b0e89b3..c003f5e8 100755
--- a/wqflask/wqflask/marker_regression/marker_regression.py
+++ b/wqflask/wqflask/marker_regression/marker_regression.py
@@ -39,9 +39,10 @@ from utility import helper_functions
 from utility import Plot, Bunch
 from utility import temp_data
 from utility.benchmark import Bench
-from utility.tools import pylmm_command
+from utility.tools import pylmm_command, plink_command
 
 PYLMM_PATH,PYLMM_COMMAND = pylmm_command()
+PLINK_PATH,PLINK_COMMAND = plink_command()
 
 class MarkerRegression(object):
 
@@ -178,6 +179,7 @@ class MarkerRegression(object):
         
 
             self.js_data = dict(
+                result_score_type = "LOD",
                 json_data = self.json_data,
                 this_trait = self.this_trait.name,
                 data_set = self.dataset.name,
@@ -458,29 +460,16 @@ class MarkerRegression(object):
 
 
     def run_plink(self):
-    
-        os.chdir("/home/zas1024/plink")
-        
         plink_output_filename = webqtlUtil.genRandStr("%s_%s_"%(self.dataset.group.name, self.this_trait.name))
         
         self.gen_pheno_txt_file_plink(pheno_filename = plink_output_filename)
         
-        plink_command = './plink --noweb --ped %s.ped --no-fid --no-parents --no-sex --no-pheno --map %s.map --pheno %s/%s.txt --pheno-name %s --maf %s --missing-phenotype -9999 --out %s%s --assoc ' % (self.dataset.group.name, self.dataset.group.name, webqtlConfig.TMPDIR, plink_output_filename, self.this_trait.name, self.maf, webqtlConfig.TMPDIR, plink_output_filename)
-        
+        plink_command = PLINK_COMMAND + ' --noweb --ped %s/%s.ped --no-fid --no-parents --no-sex --no-pheno --map %s/%s.map --pheno %s%s.txt --pheno-name %s --maf %s --missing-phenotype -9999 --out %s%s --assoc ' % (PLINK_PATH, self.dataset.group.name, PLINK_PATH, self.dataset.group.name, webqtlConfig.TMPDIR, plink_output_filename, self.this_trait.name, self.maf, webqtlConfig.TMPDIR, plink_output_filename)
+        print("plink_command:", plink_command)        
+
         os.system(plink_command)
 
         count, p_values = self.parse_plink_output(plink_output_filename)
-        #gemma_command = './gemma -bfile %s -k output_%s.cXX.txt -lmm 1 -o %s_output' % (
-        #                                                                                         self.dataset.group.name,
-        #                                                                                         self.dataset.group.name,
-        #                                                                                         self.dataset.group.name)
-        #print("gemma_command:" + gemma_command)
-        #
-        #os.system(gemma_command)
-        #
-        #included_markers, p_values = self.parse_gemma_output()
-        #
-        #self.dataset.group.get_specified_markers(markers = included_markers)
         
         #for marker in self.dataset.group.markers.markers:
         #    if marker['name'] not in included_markers:
@@ -567,10 +556,7 @@ class MarkerRegression(object):
     
     # get strain name from ped file in order
     def get_samples_from_ped_file(self):
-        
-        os.chdir("/home/zas1024/plink")
-        
-        ped_file= open("{}.ped".format(self.dataset.group.name),"r")
+        ped_file= open("{}/{}.ped".format(PLINK_PATH, self.dataset.group.name),"r")
         line = ped_file.readline()
         sample_list=[]
         
diff --git a/wqflask/wqflask/static/new/javascript/create_lodchart.coffee b/wqflask/wqflask/static/new/javascript/create_lodchart.coffee
index 76be5490..df176f52 100644
--- a/wqflask/wqflask/static/new/javascript/create_lodchart.coffee
+++ b/wqflask/wqflask/static/new/javascript/create_lodchart.coffee
@@ -1,4 +1,4 @@
-create_manhattan_plot = ->
+create_lod_chart = ->
     h = 500
     w = 1200
     margin = {left:60, top:40, right:40, bottom: 40, inner:5}
@@ -18,7 +18,7 @@ create_manhattan_plot = ->
                         .height(h)
                         .width(w)
                         .margin(margin)
-                        .ylab("LOD score")
+                        .ylab(js_data.result_score_type + " score")
                         .manhattanPlot(js_data.manhattan_plot)
                         #.additive(additive)
                         
@@ -44,8 +44,13 @@ create_manhattan_plot = ->
                     d3.select(this)
                       .transition().duration(500).attr("r", r*3)
                       .transition().duration(500).attr("r", r)
-                  
-create_manhattan_plot()
+
+$ ->
+    #window.setTimeout ( ->
+    #    console.log(js_data)
+    #), 1000
+    #window.setTimeout(create_lod_chart(), 1000)
+    root.create_lod_chart = create_lod_chart
 
 $("#export").click =>
     #Get d3 SVG element
diff --git a/wqflask/wqflask/static/new/javascript/create_lodchart.js b/wqflask/wqflask/static/new/javascript/create_lodchart.js
index f61f05bd..a7cea8a5 100644
--- a/wqflask/wqflask/static/new/javascript/create_lodchart.js
+++ b/wqflask/wqflask/static/new/javascript/create_lodchart.js
@@ -1,73 +1,76 @@
 // Generated by CoffeeScript 1.8.0
-var create_manhattan_plot;
+(function() {
+  var create_lod_chart;
 
-create_manhattan_plot = function() {
-  var additive, chrrect, data, h, halfh, margin, mychart, totalh, totalw, w;
-  h = 500;
-  w = 1200;
-  margin = {
-    left: 60,
-    top: 40,
-    right: 40,
-    bottom: 40,
-    inner: 5
-  };
-  halfh = h + margin.top + margin.bottom;
-  totalh = halfh * 2;
-  totalw = w + margin.left + margin.right;
-  if ('additive' in js_data) {
-    additive = js_data.additive;
-  } else {
-    additive = false;
-  }
-  console.log("js_data:", js_data);
-  mychart = lodchart().lodvarname("lod.hk").height(h).width(w).margin(margin).ylab("LOD score").manhattanPlot(js_data.manhattan_plot);
-  data = js_data.json_data;
-  d3.select("div#topchart").datum(data).call(mychart);
-  chrrect = mychart.chrSelect();
-  chrrect.on("mouseover", function() {
-    return d3.select(this).attr("fill", "#E9CFEC");
-  }).on("mouseout", function(d, i) {
-    return d3.select(this).attr("fill", function() {
-      if (i % 2) {
-        return "#F1F1F9";
-      }
-      return "#FBFBFF";
+  create_lod_chart = function() {
+    var additive, chrrect, data, h, halfh, margin, mychart, totalh, totalw, w;
+    h = 500;
+    w = 1200;
+    margin = {
+      left: 60,
+      top: 40,
+      right: 40,
+      bottom: 40,
+      inner: 5
+    };
+    halfh = h + margin.top + margin.bottom;
+    totalh = halfh * 2;
+    totalw = w + margin.left + margin.right;
+    if ('additive' in js_data) {
+      additive = js_data.additive;
+    } else {
+      additive = false;
+    }
+    console.log("js_data:", js_data);
+    mychart = lodchart().lodvarname("lod.hk").height(h).width(w).margin(margin).ylab(js_data.result_score_type + " score").manhattanPlot(js_data.manhattan_plot);
+    data = js_data.json_data;
+    d3.select("div#topchart").datum(data).call(mychart);
+    chrrect = mychart.chrSelect();
+    chrrect.on("mouseover", function() {
+      return d3.select(this).attr("fill", "#E9CFEC");
+    }).on("mouseout", function(d, i) {
+      return d3.select(this).attr("fill", function() {
+        if (i % 2) {
+          return "#F1F1F9";
+        }
+        return "#FBFBFF";
+      });
+    });
+    return mychart.markerSelect().on("click", function(d) {
+      var r;
+      r = d3.select(this).attr("r");
+      return d3.select(this).transition().duration(500).attr("r", r * 3).transition().duration(500).attr("r", r);
     });
-  });
-  return mychart.markerSelect().on("click", function(d) {
-    var r;
-    r = d3.select(this).attr("r");
-    return d3.select(this).transition().duration(500).attr("r", r * 3).transition().duration(500).attr("r", r);
-  });
-};
+  };
 
-create_manhattan_plot();
+  root.create_lod_chart = create_lod_chart;
 
-$("#export").click((function(_this) {
-  return function() {
-    var filename, form, svg, svg_xml;
-    svg = $("#topchart").find("svg")[0];
-    svg_xml = (new XMLSerializer).serializeToString(svg);
-    console.log("svg_xml:", svg_xml);
-    filename = "manhattan_plot_" + js_data.this_trait;
-    form = $("#exportform");
-    form.find("#data").val(svg_xml);
-    form.find("#filename").val(filename);
-    return form.submit();
-  };
-})(this));
+  $("#export").click((function(_this) {
+    return function() {
+      var filename, form, svg, svg_xml;
+      svg = $("#topchart").find("svg")[0];
+      svg_xml = (new XMLSerializer).serializeToString(svg);
+      console.log("svg_xml:", svg_xml);
+      filename = "manhattan_plot_" + js_data.this_trait;
+      form = $("#exportform");
+      form.find("#data").val(svg_xml);
+      form.find("#filename").val(filename);
+      return form.submit();
+    };
+  })(this));
 
-$("#export_pdf").click((function(_this) {
-  return function() {
-    var filename, form, svg, svg_xml;
-    svg = $("#topchart").find("svg")[0];
-    svg_xml = (new XMLSerializer).serializeToString(svg);
-    console.log("svg_xml:", svg_xml);
-    filename = "manhattan_plot_" + js_data.this_trait;
-    form = $("#exportpdfform");
-    form.find("#data").val(svg_xml);
-    form.find("#filename").val(filename);
-    return form.submit();
-  };
-})(this));
+  $("#export_pdf").click((function(_this) {
+    return function() {
+      var filename, form, svg, svg_xml;
+      svg = $("#topchart").find("svg")[0];
+      svg_xml = (new XMLSerializer).serializeToString(svg);
+      console.log("svg_xml:", svg_xml);
+      filename = "manhattan_plot_" + js_data.this_trait;
+      form = $("#exportpdfform");
+      form.find("#data").val(svg_xml);
+      form.find("#filename").val(filename);
+      return form.submit();
+    };
+  })(this));
+
+}).call(this);
diff --git a/wqflask/wqflask/static/new/javascript/lod_chart.coffee b/wqflask/wqflask/static/new/javascript/lod_chart.coffee
index b0f4b2f5..55ffdce0 100644
--- a/wqflask/wqflask/static/new/javascript/lod_chart.coffee
+++ b/wqflask/wqflask/static/new/javascript/lod_chart.coffee
@@ -1,514 +1,517 @@
-lodchart = () ->

-    width = 800

-    height = 500

-    margin = {left:60, top:40, right:40, bottom: 40, inner:5}

-    axispos = {xtitle:25, ytitle:30, xlabel:5, ylabel:5}

-    titlepos = 20

-    manhattanPlot = false

-    additive = false

-    ylim = null

-    additive_ylim = null

-    nyticks = 5

-    yticks = null

-    additive_yticks = null

-    chrGap = 8

-    darkrect = "#F1F1F9"

-    lightrect = "#FBFBFF" 

-    lodlinecolor = "darkslateblue"

-    additivelinecolor = "red"

-    linewidth = 2

-    suggestivecolor = "gainsboro"

-    significantcolor = "#EBC7C7"

-    pointcolor = "#E9CFEC" # pink

-    pointsize = 0 # default = no visible points at markers

-    pointstroke = "black"

-    title = ""

-    xlab = "Chromosome"

-    ylab = "LRS score"

-    additive_ylab = "Additive Effect"

-    rotate_ylab = null

-    yscale = d3.scale.linear()

-    additive_yscale = d3.scale.linear()

-    xscale = null

-    pad4heatmap = false

-    lodcurve = null

-    lodvarname = null

-    markerSelect = null

-    chrSelect = null

-    pointsAtMarkers = true

-    

-  

-    ## the main function

-    chart = (selection) ->

-      selection.each (data) ->

-        

-        #console.log("data:", data)

-        

-        if manhattanPlot == true

-            pointcolor = "darkslateblue"

-            pointsize = 2

-        

-        lodvarname = lodvarname ? data.lodnames[0]

-        data[lodvarname] = (Math.abs(x) for x in data[lodvarname]) # take absolute values

-        ylim = ylim ? [0, d3.max(data[lodvarname])]    

-        if additive

-            data['additive'] = (Math.abs(x) for x in data['additive'])

-            additive_ylim = additive_ylim ? [0, d3.max(data['additive'])]   

-

-        lodvarnum = data.lodnames.indexOf(lodvarname)

-

-        # Select the svg element, if it exists.

-        svg = d3.select(this).selectAll("svg").data([data])

-

-        # Otherwise, create the skeletal chart.

-        gEnter = svg.enter().append("svg").append("g")

-

-        # Update the outer dimensions.

-        svg.attr("width", width+margin.left+margin.right)

-           .attr("height", height+margin.top+margin.bottom)

-

-        # Update the inner dimensions.

-        g = svg.select("g")

-

-        # box

-        g.append("rect")

-         .attr("x", margin.left)

-         .attr("y", margin.top)

-         .attr("height", height)

-         .attr("width", width)

-         .attr("fill", darkrect)

-         .attr("stroke", "none")

-

-        yscale.domain(ylim)

-              .range([height+margin.top, margin.top+margin.inner])

-

-        # if yticks not provided, use nyticks to choose pretty ones

-        yticks = yticks ? yscale.ticks(nyticks)

-

-        #if data['additive'].length > 0

-        if additive

-            additive_yscale.domain(additive_ylim)

-                  .range([height+margin.top, margin.top+margin.inner + height/2])

-                  

-            additive_yticks = additive_yticks ? additive_yscale.ticks(nyticks)

-  

-        # reorganize lod,pos by chromosomes

-        reorgLodData(data, lodvarname)

-  

-        # add chromosome scales (for x-axis)

-        data = chrscales(data, width, chrGap, margin.left, pad4heatmap)

-        xscale = data.xscale

-  

-        # chr rectangles

-        chrSelect =

-                  g.append("g").attr("class", "chrRect")

-                   .selectAll("empty")

-                   .data(data.chrnames)

-                   .enter()

-                   .append("rect")

-                   .attr("id", (d) -> "chrrect#{d[0]}")

-                   .attr("x", (d,i) ->

-                     return data.chrStart[i] if i==0 and pad4heatmap

-                     data.chrStart[i]-chrGap/2)

-                   .attr("width", (d,i) ->

-                      return data.chrEnd[i] - data.chrStart[i]+chrGap/2 if (i==0 or i+1 == data.chrnames.length) and pad4heatmap

-                      data.chrEnd[i] - data.chrStart[i]+chrGap)

-                   .attr("y", margin.top)

-                   .attr("height", height)

-                   .attr("fill", (d,i) ->

-                      return darkrect if i % 2

-                      lightrect)

-                   .attr("stroke", "none")

-                   .on("click", (d) ->

-                      console.log("d is:", d)

-                      redraw_plot(d)

-                    )   

-  

-        # x-axis labels

-        xaxis = g.append("g").attr("class", "x axis")

-        xaxis.selectAll("empty")

-             .data(data.chrnames)

-             .enter()

-             .append("text")

-             .text((d) -> d[0])

-             .attr("x", (d,i) -> (data.chrStart[i]+data.chrEnd[i])/2)

-             .attr("y", margin.top+height+axispos.xlabel)

-             .attr("dominant-baseline", "hanging")

-             .attr("text-anchor", "middle")

-             .attr("cursor", "pointer")

-             .on("click", (d) ->

-                 redraw_plot(d)

-              )   

-             

-        xaxis.append("text").attr("class", "title")

-             .attr("y", margin.top+height+axispos.xtitle)

-             .attr("x", margin.left+width/2)

-             .attr("fill", "slateblue")

-             .text(xlab)

-

-  

-        redraw_plot = (chr_ob) ->

-             #console.log("chr_name is:", chr_ob[0])

-             #console.log("chr_length is:", chr_ob[1])

-             $('#topchart').remove()

-             $('#chart_container').append('<div class="qtlcharts" id="topchart"></div>')

-             chr_plot = new Chr_Lod_Chart(600, 1200, chr_ob, manhattanPlot)

-  

-        # y-axis

-        rotate_ylab = rotate_ylab ? (ylab.length > 1)

-        yaxis = g.append("g").attr("class", "y axis")

-        yaxis.selectAll("empty")

-             .data(yticks)

-             .enter()

-             .append("line")

-             .attr("y1", (d) -> yscale(d))

-             .attr("y2", (d) -> yscale(d))

-             .attr("x1", margin.left)

-             .attr("x2", margin.left+7)

-             .attr("fill", "none")

-             .attr("stroke", "white")

-             .attr("stroke-width", 1)

-             .style("pointer-events", "none")

-             

-        yaxis.selectAll("empty")

-             .data(yticks)

-             .enter()

-             .append("text")

-             .attr("y", (d) -> yscale(d))

-             .attr("x", margin.left-axispos.ylabel)

-             .attr("fill", "blue")

-             .attr("dominant-baseline", "middle")

-             .attr("text-anchor", "end")

-             .text((d) -> formatAxis(yticks)(d))

-             

-        yaxis.append("text").attr("class", "title")

-             .attr("y", margin.top+height/2)

-             .attr("x", margin.left-axispos.ytitle)

-             .text(ylab)

-             .attr("transform", if rotate_ylab then "rotate(270,#{margin.left-axispos.ytitle},#{margin.top+height/2})" else "")

-             .attr("text-anchor", "middle")

-             .attr("fill", "slateblue")

-  

-        #if data['additive'].length > 0

-        if additive

-            rotate_additive_ylab = rotate_additive_ylab ? (additive_ylab.length > 1)

-            additive_yaxis = g.append("g").attr("class", "y axis")

-            additive_yaxis.selectAll("empty")

-                 .data(additive_yticks)

-                 .enter()

-                 .append("line")

-                 .attr("y1", (d) -> additive_yscale(d))

-                 .attr("y2", (d) -> additive_yscale(d))

-                 .attr("x1", margin.left + width)

-                 .attr("x2", margin.left + width - 7)

-                 .attr("fill", "none")

-                 .attr("stroke", "white")

-                 .attr("stroke-width", 1)

-                 .style("pointer-events", "none")

-        

-            additive_yaxis.selectAll("empty")

-                 .data(additive_yticks)

-                 .enter()

-                 .append("text")

-                 .attr("y", (d) -> additive_yscale(d))

-                 .attr("x", (d) -> margin.left + width + axispos.ylabel + 20)

-                 .attr("fill", "green")

-                 .attr("dominant-baseline", "middle")

-                 .attr("text-anchor", "end")

-                 .text((d) -> formatAxis(additive_yticks)(d))

-                 

-            additive_yaxis.append("text").attr("class", "title")

-                 .attr("y", margin.top+1.5*height)

-                 .attr("x", margin.left + width + axispos.ytitle)

-                 .text(additive_ylab)

-                 .attr("transform", if rotate_additive_ylab then "rotate(270,#{margin.left + width + axispos.ytitle}, #{margin.top+height*1.5})" else "")

-                 .attr("text-anchor", "middle")

-                 .attr("fill", "green")

-  

-        if 'suggestive' of data

-            suggestive_bar = g.append("g").attr("class", "suggestive")

-            suggestive_bar.selectAll("empty")

-                 .data([data.suggestive])

-                 .enter()

-                 .append("line")

-                 .attr("y1", (d) -> yscale(d))

-                 .attr("y2", (d) -> yscale(d))

-                 .attr("x1", margin.left)

-                 .attr("x2", margin.left+width)

-                 .attr("fill", "none")

-                 .attr("stroke", suggestivecolor)

-                 .attr("stroke-width", 5)

-                 .style("pointer-events", "none")

-    

-            suggestive_bar = g.append("g").attr("class", "significant")

-            suggestive_bar.selectAll("empty")

-                 .data([data.significant])

-                 .enter()

-                 .append("line")

-                 .attr("y1", (d) -> yscale(d))

-                 .attr("y2", (d) -> yscale(d))

-                 .attr("x1", margin.left)

-                 .attr("x2", margin.left+width)

-                 .attr("fill", "none")

-                 .attr("stroke", significantcolor)

-                 .attr("stroke-width", 5)

-                 .style("pointer-events", "none")

-                 

-        if manhattanPlot == false

-            # lod curves by chr

-            lodcurve = (chr, lodcolumn) ->

-                d3.svg.line()

-                  .x((d) -> xscale[chr](d))

-                  .y((d,i) -> yscale(data.lodByChr[chr][i][lodcolumn]))

-                  

-            if additive

-                additivecurve = (chr, lodcolumn) ->

-                    d3.svg.line()

-                      .x((d) -> xscale[chr](d))

-                      .y((d,i) -> additive_yscale(data.additiveByChr[chr][i][lodcolumn]))

-      

-            curves = g.append("g").attr("id", "curves")

-      

-            for chr in data.chrnames

-              curves.append("path")

-                    .datum(data.posByChr[chr[0]])

-                    .attr("d", lodcurve(chr[0], lodvarnum))

-                    .attr("stroke", lodlinecolor)

-                    .attr("fill", "none")

-                    .attr("stroke-width", linewidth)

-                    .style("pointer-events", "none")

-            

-            if additive

-                for chr in data.chrnames

-                    curves.append("path")

-                          .datum(data.posByChr[chr[0]])

-                          .attr("d", additivecurve(chr[0], lodvarnum))

-                          .attr("stroke", additivelinecolor)

-                          .attr("fill", "none")

-                          .attr("stroke-width", 1)

-                          .style("pointer-events", "none")

-        

-        # points at markers

-        console.log("before pointsize")

-        if pointsize > 0

-            console.log("pointsize > 0 !!!")

-          markerpoints = g.append("g").attr("id", "markerpoints_visible")

-          markerpoints.selectAll("empty")

-                      .data(data.markers)

-                      .enter()

-                      .append("circle")

-                      .attr("cx", (d) -> xscale[d.chr](d.pos))

-                      .attr("cy", (d) -> yscale(d.lod))

-                      .attr("r", pointsize)

-                      .attr("fill", pointcolor)

-                      .attr("stroke", pointstroke)

-                      .attr("pointer-events", "hidden")

-  

-        # title

-        titlegrp = g.append("g").attr("class", "title")

-         .append("text")

-         .attr("x", margin.left+width/2)

-         .attr("y", margin.top-titlepos)

-         .text(title)

-  

-        # another box around edge

-        g.append("rect")

-         .attr("x", margin.left)

-         .attr("y", margin.top)

-         .attr("height", height)

-         .attr("width", () ->

-            return(data.chrEnd[-1..][0]-margin.left) if pad4heatmap

-            data.chrEnd[-1..][0]-margin.left+chrGap/2)

-         .attr("fill", "none")

-         .attr("stroke", "black")

-         .attr("stroke-width", "none")

-  

-        if pointsAtMarkers

-          # these hidden points are what gets selected...a bit larger

-          hiddenpoints = g.append("g").attr("id", "markerpoints_hidden")

-  

-          markertip = d3.tip()

-                        .attr('class', 'd3-tip')

-                        .html((d) ->

-                          [d.name, " LRS = #{d3.format('.2f')(d.lod)}"])

-                        .direction("e")

-                        .offset([0,10])

-          svg.call(markertip)

-  

-          markerSelect =

-            hiddenpoints.selectAll("empty")

-                        .data(data.markers)

-                        .enter()

-                        .append("circle")

-                        .attr("cx", (d) -> xscale[d.chr](d.pos))

-                        .attr("cy", (d) -> yscale(d.lod))

-                        .attr("id", (d) -> d.name)

-                        .attr("r", d3.max([pointsize*2, 3]))

-                        .attr("opacity", 0)

-                        .attr("fill", pointcolor)

-                        .attr("stroke", pointstroke)

-                        .attr("stroke-width", "1")

-                        .on "mouseover.paneltip", (d) ->

-                           d3.select(this).attr("opacity", 1)

-                           markertip.show(d)

-                        .on "mouseout.paneltip", ->

-                           d3.select(this).attr("opacity", 0)

-                                          .call(markertip.hide)

-  

-    ## configuration parameters

-    chart.width = (value) ->

-      return width unless arguments.length

-      width = value

-      chart

-  

-    chart.height = (value) ->

-      return height unless arguments.length

-      height = value

-      chart

-  

-    chart.margin = (value) ->

-      return margin unless arguments.length

-      margin = value

-      chart

-  

-    chart.titlepos = (value) ->

-      return titlepos unless arguments.length

-      titlepos

-      chart

-  

-    chart.axispos = (value) ->

-      return axispos unless arguments.length

-      axispos = value

-      chart

-      

-    chart.manhattanPlot = (value) ->

-      return manhattanPlot unless arguments.length

-      manhattanPlot = value

-      chart

-  

-    chart.ylim = (value) ->

-      return ylim unless arguments.length

-      ylim = value

-      chart

-      

-    #if data['additive'].length > 0

-    chart.additive_ylim = (value) ->

-      return additive_ylim unless arguments.length

-      additive_ylim = value

-      chart

-      

-    chart.nyticks = (value) ->

-      return nyticks unless arguments.length

-      nyticks = value

-      chart

-  

-    chart.yticks = (value) ->

-      return yticks unless arguments.length

-      yticks = value

-      chart

-  

-    chart.chrGap = (value) ->

-      return chrGap unless arguments.length

-      chrGap = value

-      chart

-  

-    chart.darkrect = (value) ->

-      return darkrect unless arguments.length

-      darkrect = value

-      chart

-  

-    chart.lightrect = (value) ->

-      return lightrect unless arguments.length

-      lightrect = value

-      chart

-  

-    chart.linecolor = (value) ->

-      return linecolor unless arguments.length

-      linecolor = value

-      chart

-  

-    chart.linewidth = (value) ->

-      return linewidth unless arguments.length

-      linewidth = value

-      chart

-  

-    chart.pointcolor = (value) ->

-      return pointcolor unless arguments.length

-      pointcolor = value

-      chart

-  

-    chart.pointsize = (value) ->

-      return pointsize unless arguments.length

-      pointsize = value

-      chart

-  

-    chart.pointstroke = (value) ->

-      return pointstroke unless arguments.length

-      pointstroke = value

-      chart

-  

-    chart.title = (value) ->

-      return title unless arguments.length

-      title = value

-      chart

-  

-    chart.xlab = (value) ->

-      return xlab unless arguments.length

-      xlab = value

-      chart

-  

-    chart.ylab = (value) ->

-      return ylab unless arguments.length

-      ylab = value

-      chart

-  

-    chart.rotate_ylab = (value) ->

-      return rotate_ylab if !arguments.length

-      rotate_ylab = value

-      chart

-  

-    chart.lodvarname = (value) ->

-      return lodvarname unless arguments.length

-      lodvarname = value

-      chart

-  

-    chart.pad4heatmap = (value) ->

-      return pad4heatmap unless arguments.length

-      pad4heatmap = value

-      chart

-  

-    chart.pointsAtMarkers = (value) ->

-      return pointsAtMarkers unless arguments.length

-      pointsAtMarkers = value

-      chart

-  

-    chart.yscale = () ->

-      return yscale

-    

-    chart.additive = () ->

-      return additive

-    

-    #if data['additive'].length > 0

-    chart.additive_yscale = () ->

-      return additive_yscale

-  

-    chart.xscale = () ->

-      return xscale

-  

-    if manhattanPlot == false

-        chart.lodcurve = () ->

-          return lodcurve

-    

-    #if data['additive'].length > 0

-    chart.additivecurve = () ->

-      return additivecurve

-  

-    chart.markerSelect = () ->

-      return markerSelect

-  

-    chart.chrSelect = () ->

-      return chrSelect

-  

-    # return the chart function

-    chart

-

+lodchart = () ->
+    width = 800
+    height = 500
+    margin = {left:60, top:40, right:40, bottom: 40, inner:5}
+    axispos = {xtitle:25, ytitle:30, xlabel:5, ylabel:5}
+    titlepos = 20
+    manhattanPlot = false
+    additive = false
+    ylim = null
+    additive_ylim = null
+    nyticks = 5
+    yticks = null
+    additive_yticks = null
+    chrGap = 8
+    darkrect = "#F1F1F9"
+    lightrect = "#FBFBFF" 
+    lodlinecolor = "darkslateblue"
+    additivelinecolor = "red"
+    linewidth = 2
+    suggestivecolor = "gainsboro"
+    significantcolor = "#EBC7C7"
+    pointcolor = "#E9CFEC" # pink
+    pointsize = 0 # default = no visible points at markers
+    pointstroke = "black"
+    title = ""
+    xlab = "Chromosome"
+    ylab = "LRS score"
+    additive_ylab = "Additive Effect"
+    rotate_ylab = null
+    yscale = d3.scale.linear()
+    additive_yscale = d3.scale.linear()
+    xscale = null
+    pad4heatmap = false
+    lodcurve = null
+    lodvarname = null
+    markerSelect = null
+    chrSelect = null
+    pointsAtMarkers = true
+    
+  
+    ## the main function
+    chart = (selection) ->
+      selection.each (data) ->
+        
+        #console.log("data:", data)
+        
+        if manhattanPlot == true
+            pointcolor = "darkslateblue"
+            pointsize = 2
+        
+        lodvarname = lodvarname ? data.lodnames[0]
+        data[lodvarname] = (Math.abs(x) for x in data[lodvarname]) # take absolute values
+        ylim = ylim ? [0, d3.max(data[lodvarname])]    
+        if additive
+            data['additive'] = (Math.abs(x) for x in data['additive'])
+            additive_ylim = additive_ylim ? [0, d3.max(data['additive'])]   
+
+        lodvarnum = data.lodnames.indexOf(lodvarname)
+
+        # Select the svg element, if it exists.
+        svg = d3.select(this).selectAll("svg").data([data])
+
+        # Otherwise, create the skeletal chart.
+        gEnter = svg.enter().append("svg").append("g")
+
+        # Update the outer dimensions.
+        svg.attr("width", width+margin.left+margin.right)
+           .attr("height", height+margin.top+margin.bottom)
+
+        # Update the inner dimensions.
+        g = svg.select("g")
+
+        # box
+        g.append("rect")
+         .attr("x", margin.left)
+         .attr("y", margin.top)
+         .attr("height", height)
+         .attr("width", width)
+         .attr("fill", darkrect)
+         .attr("stroke", "none")
+
+        yscale.domain(ylim)
+              .range([height+margin.top, margin.top+margin.inner])
+
+        # if yticks not provided, use nyticks to choose pretty ones
+        yticks = yticks ? yscale.ticks(nyticks)
+
+        #if data['additive'].length > 0
+        if additive
+            additive_yscale.domain(additive_ylim)
+                  .range([height+margin.top, margin.top+margin.inner + height/2])
+                  
+            additive_yticks = additive_yticks ? additive_yscale.ticks(nyticks)
+  
+        # reorganize lod,pos by chromosomes
+        reorgLodData(data, lodvarname)
+  
+        # add chromosome scales (for x-axis)
+        data = chrscales(data, width, chrGap, margin.left, pad4heatmap)
+        xscale = data.xscale
+  
+        # chr rectangles
+        chrSelect =
+                  g.append("g").attr("class", "chrRect")
+                   .selectAll("empty")
+                   .data(data.chrnames)
+                   .enter()
+                   .append("rect")
+                   .attr("id", (d) -> "chrrect#{d[0]}")
+                   .attr("x", (d,i) ->
+                     return data.chrStart[i] if i==0 and pad4heatmap
+                     data.chrStart[i]-chrGap/2)
+                   .attr("width", (d,i) ->
+                      return data.chrEnd[i] - data.chrStart[i]+chrGap/2 if (i==0 or i+1 == data.chrnames.length) and pad4heatmap
+                      data.chrEnd[i] - data.chrStart[i]+chrGap)
+                   .attr("y", margin.top)
+                   .attr("height", height)
+                   .attr("fill", (d,i) ->
+                      return darkrect if i % 2
+
+                      lightrect)
+                   .attr("stroke", "none")
+                   .on("click", (d) ->
+                      console.log("d is:", d)
+                      redraw_plot(d)
+                    )   
+  
+        # x-axis labels
+        xaxis = g.append("g").attr("class", "x axis")
+        xaxis.selectAll("empty")
+             .data(data.chrnames)
+             .enter()
+             .append("text")
+             .text((d) -> d[0])
+             .attr("x", (d,i) -> (data.chrStart[i]+data.chrEnd[i])/2)
+             .attr("y", margin.top+height+axispos.xlabel)
+             .attr("dominant-baseline", "hanging")
+             .attr("text-anchor", "middle")
+             .attr("cursor", "pointer")
+             .on("click", (d) ->
+                 redraw_plot(d)
+              )   
+             
+        xaxis.append("text").attr("class", "title")
+             .attr("y", margin.top+height+axispos.xtitle)
+             .attr("x", margin.left+width/2)
+             .attr("fill", "slateblue")
+             .text(xlab)
+
+  
+        redraw_plot = (chr_ob) ->
+             #console.log("chr_name is:", chr_ob[0])
+             #console.log("chr_length is:", chr_ob[1])
+             $('#topchart').remove()
+             $('#chart_container').append('<div class="qtlcharts" id="topchart"></div>')
+             chr_plot = new Chr_Lod_Chart(600, 1200, chr_ob, manhattanPlot)
+  
+        # y-axis
+        rotate_ylab = rotate_ylab ? (ylab.length > 1)
+        yaxis = g.append("g").attr("class", "y axis")
+        yaxis.selectAll("empty")
+             .data(yticks)
+             .enter()
+             .append("line")
+             .attr("y1", (d) -> yscale(d))
+             .attr("y2", (d) -> yscale(d))
+             .attr("x1", margin.left)
+             .attr("x2", margin.left+7)
+             .attr("fill", "none")
+             .attr("stroke", "white")
+             .attr("stroke-width", 1)
+             .style("pointer-events", "none")
+             
+        yaxis.selectAll("empty")
+             .data(yticks)
+             .enter()
+             .append("text")
+             .attr("y", (d) -> yscale(d))
+             .attr("x", margin.left-axispos.ylabel)
+             .attr("fill", "blue")
+             .attr("dominant-baseline", "middle")
+             .attr("text-anchor", "end")
+             .text((d) -> formatAxis(yticks)(d))
+             
+        yaxis.append("text").attr("class", "title")
+             .attr("y", margin.top+height/2)
+             .attr("x", margin.left-axispos.ytitle)
+             .text(ylab)
+             .attr("transform", if rotate_ylab then "rotate(270,#{margin.left-axispos.ytitle},#{margin.top+height/2})" else "")
+             .attr("text-anchor", "middle")
+             .attr("fill", "slateblue")
+  
+        #if data['additive'].length > 0
+        if additive
+            rotate_additive_ylab = rotate_additive_ylab ? (additive_ylab.length > 1)
+            additive_yaxis = g.append("g").attr("class", "y axis")
+            additive_yaxis.selectAll("empty")
+                 .data(additive_yticks)
+                 .enter()
+                 .append("line")
+                 .attr("y1", (d) -> additive_yscale(d))
+                 .attr("y2", (d) -> additive_yscale(d))
+                 .attr("x1", margin.left + width)
+                 .attr("x2", margin.left + width - 7)
+                 .attr("fill", "none")
+                 .attr("stroke", "white")
+                 .attr("stroke-width", 1)
+                 .style("pointer-events", "none")
+        
+            additive_yaxis.selectAll("empty")
+                 .data(additive_yticks)
+                 .enter()
+                 .append("text")
+                 .attr("y", (d) -> additive_yscale(d))
+                 .attr("x", (d) -> margin.left + width + axispos.ylabel + 20)
+                 .attr("fill", "green")
+                 .attr("dominant-baseline", "middle")
+                 .attr("text-anchor", "end")
+                 .text((d) -> formatAxis(additive_yticks)(d))
+                 
+            additive_yaxis.append("text").attr("class", "title")
+                 .attr("y", margin.top+1.5*height)
+                 .attr("x", margin.left + width + axispos.ytitle)
+                 .text(additive_ylab)
+                 .attr("transform", if rotate_additive_ylab then "rotate(270,#{margin.left + width + axispos.ytitle}, #{margin.top+height*1.5})" else "")
+                 .attr("text-anchor", "middle")
+                 .attr("fill", "green")
+  
+        if 'suggestive' of data
+            suggestive_bar = g.append("g").attr("class", "suggestive")
+            suggestive_bar.selectAll("empty")
+                 .data([data.suggestive])
+                 .enter()
+                 .append("line")
+                 .attr("y1", (d) -> yscale(d))
+                 .attr("y2", (d) -> yscale(d))
+                 .attr("x1", margin.left)
+                 .attr("x2", margin.left+width)
+                 .attr("fill", "none")
+                 .attr("stroke", suggestivecolor)
+                 .attr("stroke-width", 5)
+                 .style("pointer-events", "none")
+    
+            suggestive_bar = g.append("g").attr("class", "significant")
+            suggestive_bar.selectAll("empty")
+                 .data([data.significant])
+                 .enter()
+                 .append("line")
+                 .attr("y1", (d) -> yscale(d))
+                 .attr("y2", (d) -> yscale(d))
+                 .attr("x1", margin.left)
+                 .attr("x2", margin.left+width)
+                 .attr("fill", "none")
+                 .attr("stroke", significantcolor)
+                 .attr("stroke-width", 5)
+                 .style("pointer-events", "none")
+                 
+        if manhattanPlot == false
+            # lod curves by chr
+            lodcurve = (chr, lodcolumn) ->
+                d3.svg.line()
+                  .x((d) -> xscale[chr](d))
+                  .y((d,i) -> yscale(data.lodByChr[chr][i][lodcolumn]))
+                  
+            if additive
+                additivecurve = (chr, lodcolumn) ->
+                    d3.svg.line()
+                      .x((d) -> xscale[chr](d))
+                      .y((d,i) -> additive_yscale(data.additiveByChr[chr][i][lodcolumn]))
+      
+            curves = g.append("g").attr("id", "curves")
+      
+            for chr in data.chrnames
+              if chr.indexOf(data['chr'])
+                  curves.append("path")
+                        .datum(data.posByChr[chr[0]])
+                        .attr("d", lodcurve(chr[0], lodvarnum))
+                        .attr("stroke", lodlinecolor)
+                        .attr("fill", "none")
+                        .attr("stroke-width", linewidth)
+                        .style("pointer-events", "none")
+            
+            if additive
+                for chr in data.chrnames
+                    if chr.indexOf(data['chr'])
+                        curves.append("path")
+                              .datum(data.posByChr[chr[0]])
+                              .attr("d", additivecurve(chr[0], lodvarnum))
+                              .attr("stroke", additivelinecolor)
+                              .attr("fill", "none")
+                              .attr("stroke-width", 1)
+                              .style("pointer-events", "none")
+        
+        # points at markers
+        console.log("before pointsize")
+        if pointsize > 0
+            console.log("pointsize > 0 !!!")
+          markerpoints = g.append("g").attr("id", "markerpoints_visible")
+          markerpoints.selectAll("empty")
+                      .data(data.markers)
+                      .enter()
+                      .append("circle")
+                      .attr("cx", (d) -> xscale[d.chr](d.pos))
+                      .attr("cy", (d) -> yscale(d.lod))
+                      .attr("r", pointsize)
+                      .attr("fill", pointcolor)
+                      .attr("stroke", pointstroke)
+                      .attr("pointer-events", "hidden")
+  
+        # title
+        titlegrp = g.append("g").attr("class", "title")
+         .append("text")
+         .attr("x", margin.left+width/2)
+         .attr("y", margin.top-titlepos)
+         .text(title)
+  
+        # another box around edge
+        g.append("rect")
+         .attr("x", margin.left)
+         .attr("y", margin.top)
+         .attr("height", height)
+         .attr("width", () ->
+            return(data.chrEnd[-1..][0]-margin.left) if pad4heatmap
+            data.chrEnd[-1..][0]-margin.left+chrGap/2)
+         .attr("fill", "none")
+         .attr("stroke", "black")
+         .attr("stroke-width", "none")
+  
+        if pointsAtMarkers
+          # these hidden points are what gets selected...a bit larger
+          hiddenpoints = g.append("g").attr("id", "markerpoints_hidden")
+  
+          markertip = d3.tip()
+                        .attr('class', 'd3-tip')
+                        .html((d) ->
+                          [d.name, " LRS = #{d3.format('.2f')(d.lod)}"])
+                        .direction("e")
+                        .offset([0,10])
+          svg.call(markertip)
+  
+          markerSelect =
+            hiddenpoints.selectAll("empty")
+                        .data(data.markers)
+                        .enter()
+                        .append("circle")
+                        .attr("cx", (d) -> xscale[d.chr](d.pos))
+                        .attr("cy", (d) -> yscale(d.lod))
+                        .attr("id", (d) -> d.name)
+                        .attr("r", d3.max([pointsize*2, 3]))
+                        .attr("opacity", 0)
+                        .attr("fill", pointcolor)
+                        .attr("stroke", pointstroke)
+                        .attr("stroke-width", "1")
+                        .on "mouseover.paneltip", (d) ->
+                           d3.select(this).attr("opacity", 1)
+                           markertip.show(d)
+                        .on "mouseout.paneltip", ->
+                           d3.select(this).attr("opacity", 0)
+                                          .call(markertip.hide)
+  
+    ## configuration parameters
+    chart.width = (value) ->
+      return width unless arguments.length
+      width = value
+      chart
+  
+    chart.height = (value) ->
+      return height unless arguments.length
+      height = value
+      chart
+  
+    chart.margin = (value) ->
+      return margin unless arguments.length
+      margin = value
+      chart
+  
+    chart.titlepos = (value) ->
+      return titlepos unless arguments.length
+      titlepos
+      chart
+  
+    chart.axispos = (value) ->
+      return axispos unless arguments.length
+      axispos = value
+      chart
+      
+    chart.manhattanPlot = (value) ->
+      return manhattanPlot unless arguments.length
+      manhattanPlot = value
+      chart
+  
+    chart.ylim = (value) ->
+      return ylim unless arguments.length
+      ylim = value
+      chart
+      
+    #if data['additive'].length > 0
+    chart.additive_ylim = (value) ->
+      return additive_ylim unless arguments.length
+      additive_ylim = value
+      chart
+      
+    chart.nyticks = (value) ->
+      return nyticks unless arguments.length
+      nyticks = value
+      chart
+  
+    chart.yticks = (value) ->
+      return yticks unless arguments.length
+      yticks = value
+      chart
+  
+    chart.chrGap = (value) ->
+      return chrGap unless arguments.length
+      chrGap = value
+      chart
+  
+    chart.darkrect = (value) ->
+      return darkrect unless arguments.length
+      darkrect = value
+      chart
+  
+    chart.lightrect = (value) ->
+      return lightrect unless arguments.length
+      lightrect = value
+      chart
+  
+    chart.linecolor = (value) ->
+      return linecolor unless arguments.length
+      linecolor = value
+      chart
+  
+    chart.linewidth = (value) ->
+      return linewidth unless arguments.length
+      linewidth = value
+      chart
+  
+    chart.pointcolor = (value) ->
+      return pointcolor unless arguments.length
+      pointcolor = value
+      chart
+  
+    chart.pointsize = (value) ->
+      return pointsize unless arguments.length
+      pointsize = value
+      chart
+  
+    chart.pointstroke = (value) ->
+      return pointstroke unless arguments.length
+      pointstroke = value
+      chart
+  
+    chart.title = (value) ->
+      return title unless arguments.length
+      title = value
+      chart
+  
+    chart.xlab = (value) ->
+      return xlab unless arguments.length
+      xlab = value
+      chart
+  
+    chart.ylab = (value) ->
+      return ylab unless arguments.length
+      ylab = value
+      chart
+  
+    chart.rotate_ylab = (value) ->
+      return rotate_ylab if !arguments.length
+      rotate_ylab = value
+      chart
+  
+    chart.lodvarname = (value) ->
+      return lodvarname unless arguments.length
+      lodvarname = value
+      chart
+  
+    chart.pad4heatmap = (value) ->
+      return pad4heatmap unless arguments.length
+      pad4heatmap = value
+      chart
+  
+    chart.pointsAtMarkers = (value) ->
+      return pointsAtMarkers unless arguments.length
+      pointsAtMarkers = value
+      chart
+  
+    chart.yscale = () ->
+      return yscale
+    
+    chart.additive = () ->
+      return additive
+    
+    #if data['additive'].length > 0
+    chart.additive_yscale = () ->
+      return additive_yscale
+  
+    chart.xscale = () ->
+      return xscale
+  
+    if manhattanPlot == false
+        chart.lodcurve = () ->
+          return lodcurve
+    
+    #if data['additive'].length > 0
+    chart.additivecurve = () ->
+      return additivecurve
+  
+    chart.markerSelect = () ->
+      return markerSelect
+  
+    chart.chrSelect = () ->
+      return chrSelect
+  
+    # return the chart function
+    chart
+
diff --git a/wqflask/wqflask/static/new/javascript/lod_chart.js b/wqflask/wqflask/static/new/javascript/lod_chart.js
index 92289bfe..631d8632 100644
--- a/wqflask/wqflask/static/new/javascript/lod_chart.js
+++ b/wqflask/wqflask/static/new/javascript/lod_chart.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.8.0
+// Generated by CoffeeScript 1.9.2
 var lodchart;
 
 lodchart = function() {
@@ -53,33 +53,33 @@ lodchart = function() {
   pointsAtMarkers = true;
   chart = function(selection) {
     return selection.each(function(data) {
-      var additive_yaxis, additivecurve, chr, curves, g, gEnter, hiddenpoints, lodvarnum, markerpoints, markertip, redraw_plot, rotate_additive_ylab, suggestive_bar, svg, titlegrp, x, xaxis, yaxis, _i, _j, _len, _len1, _ref, _ref1;
+      var additive_yaxis, additivecurve, chr, curves, g, gEnter, hiddenpoints, j, k, len, len1, lodvarnum, markerpoints, markertip, redraw_plot, ref, ref1, rotate_additive_ylab, suggestive_bar, svg, titlegrp, x, xaxis, yaxis;
       if (manhattanPlot === true) {
         pointcolor = "darkslateblue";
         pointsize = 2;
       }
       lodvarname = lodvarname != null ? lodvarname : data.lodnames[0];
       data[lodvarname] = (function() {
-        var _i, _len, _ref, _results;
-        _ref = data[lodvarname];
-        _results = [];
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          x = _ref[_i];
-          _results.push(Math.abs(x));
+        var j, len, ref, results;
+        ref = data[lodvarname];
+        results = [];
+        for (j = 0, len = ref.length; j < len; j++) {
+          x = ref[j];
+          results.push(Math.abs(x));
         }
-        return _results;
+        return results;
       })();
       ylim = ylim != null ? ylim : [0, d3.max(data[lodvarname])];
       if (additive) {
         data['additive'] = (function() {
-          var _i, _len, _ref, _results;
-          _ref = data['additive'];
-          _results = [];
-          for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-            x = _ref[_i];
-            _results.push(Math.abs(x));
+          var j, len, ref, results;
+          ref = data['additive'];
+          results = [];
+          for (j = 0, len = ref.length; j < len; j++) {
+            x = ref[j];
+            results.push(Math.abs(x));
           }
-          return _results;
+          return results;
         })();
         additive_ylim = additive_ylim != null ? additive_ylim : [0, d3.max(data['additive'])];
       }
@@ -196,16 +196,20 @@ lodchart = function() {
           };
         }
         curves = g.append("g").attr("id", "curves");
-        _ref = data.chrnames;
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          chr = _ref[_i];
-          curves.append("path").datum(data.posByChr[chr[0]]).attr("d", lodcurve(chr[0], lodvarnum)).attr("stroke", lodlinecolor).attr("fill", "none").attr("stroke-width", linewidth).style("pointer-events", "none");
+        ref = data.chrnames;
+        for (j = 0, len = ref.length; j < len; j++) {
+          chr = ref[j];
+          if (chr.indexOf(data['chr'])) {
+            curves.append("path").datum(data.posByChr[chr[0]]).attr("d", lodcurve(chr[0], lodvarnum)).attr("stroke", lodlinecolor).attr("fill", "none").attr("stroke-width", linewidth).style("pointer-events", "none");
+          }
         }
         if (additive) {
-          _ref1 = data.chrnames;
-          for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-            chr = _ref1[_j];
-            curves.append("path").datum(data.posByChr[chr[0]]).attr("d", additivecurve(chr[0], lodvarnum)).attr("stroke", additivelinecolor).attr("fill", "none").attr("stroke-width", 1).style("pointer-events", "none");
+          ref1 = data.chrnames;
+          for (k = 0, len1 = ref1.length; k < len1; k++) {
+            chr = ref1[k];
+            if (chr.indexOf(data['chr'])) {
+              curves.append("path").datum(data.posByChr[chr[0]]).attr("d", additivecurve(chr[0], lodvarnum)).attr("stroke", additivelinecolor).attr("fill", "none").attr("stroke-width", 1).style("pointer-events", "none");
+            }
           }
         }
       }
@@ -450,4 +454,4 @@ lodchart = function() {
     return chrSelect;
   };
   return chart;
-};
+};
\ No newline at end of file
diff --git a/wqflask/wqflask/static/new/javascript/panelutil.coffee b/wqflask/wqflask/static/new/javascript/panelutil.coffee
index a3bc0b44..f7b51457 100644
--- a/wqflask/wqflask/static/new/javascript/panelutil.coffee
+++ b/wqflask/wqflask/static/new/javascript/panelutil.coffee
@@ -30,16 +30,15 @@ reorgLodData = (data, lodvarname=null) ->
     data.lodByChr = {}
     
     for chr,i in data.chrnames
-      #console.log("chr:", chr)
-      data.posByChr[chr[0]] = []
-      data.lodByChr[chr[0]] = []
-      for pos, j in data.pos
-        if data.chr[j].toString() == chr[0]
-          #console.log(data.chr[j] + " AND " + chr[0])
-          data.posByChr[chr[0]].push(pos)
-          data.lodnames = [data.lodnames] unless Array.isArray(data.lodnames)
-          lodval = (data[lodcolumn][j] for lodcolumn in data.lodnames)
-          data.lodByChr[chr[0]].push(lodval)
+      if data.chr.indexOf(chr[0])
+          data.posByChr[chr[0]] = []
+          data.lodByChr[chr[0]] = []
+          for pos, j in data.pos
+            if data.chr[j].toString() == chr[0]
+              data.posByChr[chr[0]].push(pos)
+              data.lodnames = [data.lodnames] unless Array.isArray(data.lodnames)
+              lodval = (data[lodcolumn][j] for lodcolumn in data.lodnames)
+              data.lodByChr[chr[0]].push(lodval)
 
     #console.log("data.posByChr:", data.posByChr)
 
diff --git a/wqflask/wqflask/static/new/javascript/panelutil.js b/wqflask/wqflask/static/new/javascript/panelutil.js
index 3a180e60..7c14f4de 100644
--- a/wqflask/wqflask/static/new/javascript/panelutil.js
+++ b/wqflask/wqflask/static/new/javascript/panelutil.js
@@ -106,10 +106,13 @@ chrscales = function(data, width, chrGap, leftMargin, pad4heatmap) {
     if (d > maxd) {
       maxd = d;
     }
-    rng = d3.extent(data.posByChr[chr[0]]);
-    chrStart.push(rng[0]);
-    chrEnd.push(rng[1]);
-    L = rng[1] - rng[0];
+    //rng = d3.extent(data.posByChr[chr[0]]);
+    //chrStart.push(rng[0]);
+    //chrEnd.push(rng[1]);
+    //L = rng[1] - rng[0];
+    chrStart.push(0);
+    chrEnd.push(chr[1]);
+    L = chr[1]
     chrLength.push(L);
     totalChrLength += L;
   }
@@ -436,4 +439,4 @@ abs = function(x) {
     return x;
   }
   return Math.abs(x);
-};
+};
\ No newline at end of file
diff --git a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee
index 881ea74d..211fedae 100755
--- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee
+++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee
@@ -63,10 +63,12 @@ do_ajax_post = (url, form_data) ->
                 console.log(xhr)
                 clearInterval(this.my_timer)
                 $('#progress_bar_container').modal('hide')
+                $('#static_progress_bar_container').modal('hide')
                 $("body").html("We got an error.")        
             success: (data) =>
                 clearInterval(this.my_timer)
                 $('#progress_bar_container').modal('hide')
+                $('#static_progress_bar_container').modal('hide')
                 open_mapping_results(data)
                 #$("body").html(data)
         )
@@ -76,36 +78,22 @@ do_ajax_post = (url, form_data) ->
         return false
 
 open_mapping_results = (data) ->
+    #results_window = window.open("/mapping_results_container")
+    #results_window.onload = ->
+    #    results_window.document.getElementById("mapping_results_container").innerHTML = data
+
     $.colorbox(
-        html: data
-        href: "#mapping_results_holder"
-        height: "90%"
-        width: "90%"
+       html: data
+       href: "#mapping_results_holder"
+       height: "90%"
+       width: "90%"
+       onComplete: => root.create_lod_chart()
     )
 
 showalert = (message,alerttype) ->
     $('#alert_placeholder').append('<div id="alertdiv" class="alert ' +  alerttype + '"><a class="close" data-dismiss="alert">×</a><span>'+message+'</span></div>')
     
 
-$("#interval_mapping_compute").click(() =>
-        showalert("One or more outliers exist in this data set. Please review values before mapping. \
-                  Including outliers when mapping may lead to misleading results. \
-                  We recommend <A HREF=\"http://en.wikipedia.org/wiki/Winsorising\">winsorising</A> the outliers \
-                  or simply deleting them.", "alert-success")
-        console.log("In interval mapping")
-        $("#progress_bar_container").modal()
-        url = "/interval_mapping"
-        
-        $('input[name=method]').val("reaper")
-        $('input[name=manhattan_plot]').val($('input[name=manhattan_plot_reaper]:checked').val())
-        $('input[name=mapping_display_all]').val($('input[name=display_all_reaper]'))
-        $('input[name=suggestive]').val($('input[name=suggestive_reaper]'))
-        form_data = $('#trait_data_form').serialize()
-        console.log("form_data is:", form_data)
-        
-        do_ajax_post(url, form_data)
-)
-
 $('#suggestive').hide()
 
 $('input[name=display_all]').change(() =>
@@ -116,8 +104,8 @@ $('input[name=display_all]').change(() =>
             $('#suggestive').hide()
 )
 
-$("#pylmm_compute").click(() =>
-        $("#progress_bar_container").modal({show:true})
+$("#pylmm_compute").on("click", =>
+        $("#progress_bar_container").modal()
         url = "/marker_regression"
         $('input[name=method]').val("pylmm")
         $('input[name=num_perm]').val($('input[name=num_perm_pylmm]').val())
@@ -133,7 +121,7 @@ $("#pylmm_compute").click(() =>
     
     
     
-$("#rqtl_geno_compute").click(() =>
+$("#rqtl_geno_compute").on("click", =>
         $("#progress_bar_container").modal()
         url = "/marker_regression"
         $('input[name=method]').val("rqtl_geno")
@@ -150,7 +138,7 @@ $("#rqtl_geno_compute").click(() =>
 )
 
 
-$("#plink_compute").click(() =>
+$("#plink_compute").on("click", =>
         $("#static_progress_bar_container").modal()
         url = "/marker_regression"
         $('input[name=method]').val("plink")
@@ -163,7 +151,7 @@ $("#plink_compute").click(() =>
         do_ajax_post(url, form_data)
 )
 
-$("#gemma_compute").click(() =>
+$("#gemma_compute").on("click", =>
         console.log("RUNNING GEMMA")
         $("#static_progress_bar_container").modal()
         url = "/marker_regression"
@@ -177,6 +165,25 @@ $("#gemma_compute").click(() =>
         do_ajax_post(url, form_data)
 )
 
+$("#interval_mapping_compute").on("click", =>
+        showalert("One or more outliers exist in this data set. Please review values before mapping. \
+                  Including outliers when mapping may lead to misleading results. \
+                  We recommend <A HREF=\"http://en.wikipedia.org/wiki/Winsorising\">winsorising</A> the outliers \
+                  or simply deleting them.", "alert-success")
+        console.log("In interval mapping")
+        $("#progress_bar_container").modal()
+        url = "/interval_mapping"
+        
+        $('input[name=method]').val("reaper")
+        $('input[name=manhattan_plot]').val($('input[name=manhattan_plot_reaper]:checked').val())
+        $('input[name=mapping_display_all]').val($('input[name=display_all_reaper]'))
+        $('input[name=suggestive]').val($('input[name=suggestive_reaper]'))
+        form_data = $('#trait_data_form').serialize()
+        console.log("form_data is:", form_data)
+        
+        do_ajax_post(url, form_data)
+)
+
 #$(".submit_special").click(submit_special)
 
 composite_mapping_fields = ->
diff --git a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
index 1779df4b..259e4685 100755
--- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
+++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.8.0
+// Generated by CoffeeScript 1.9.2
 var block_outliers, composite_mapping_fields, do_ajax_post, get_progress, mapping_method_fields, open_mapping_results, showalert, submit_special, toggle_enable_disable, update_time_remaining;
 
 submit_special = function() {
@@ -100,31 +100,19 @@ open_mapping_results = function(data) {
     html: data,
     href: "#mapping_results_holder",
     height: "90%",
-    width: "90%"
+    width: "90%",
+    onComplete: (function(_this) {
+      return function() {
+        return root.create_lod_chart();
+      };
+    })(this)
   });
 };
 
 showalert = function(message, alerttype) {
-  return $('#alert_placeholder').append('<div id="alertdiv" class="alert ' + alerttype + '"><a class="close" data-dismiss="alert">�</a><span>' + message + '</span></div>');
+  return $('#alert_placeholder').append('<div id="alertdiv" class="alert ' + alerttype + '"><a class="close" data-dismiss="alert">×</a><span>' + message + '</span></div>');
 };
 
-$("#interval_mapping_compute").click((function(_this) {
-  return function() {
-    var form_data, url;
-    showalert("One or more outliers exist in this data set. Please review values before mapping. Including outliers when mapping may lead to misleading results. We recommend <A HREF=\"http://en.wikipedia.org/wiki/Winsorising\">winsorising</A> the outliers or simply deleting them.", "alert-success");
-    console.log("In interval mapping");
-    $("#progress_bar_container").modal();
-    url = "/interval_mapping";
-    $('input[name=method]').val("reaper");
-    $('input[name=manhattan_plot]').val($('input[name=manhattan_plot_reaper]:checked').val());
-    $('input[name=mapping_display_all]').val($('input[name=display_all_reaper]'));
-    $('input[name=suggestive]').val($('input[name=suggestive_reaper]'));
-    form_data = $('#trait_data_form').serialize();
-    console.log("form_data is:", form_data);
-    return do_ajax_post(url, form_data);
-  };
-})(this));
-
 $('#suggestive').hide();
 
 $('input[name=display_all]').change((function(_this) {
@@ -138,12 +126,10 @@ $('input[name=display_all]').change((function(_this) {
   };
 })(this));
 
-$("#pylmm_compute").click((function(_this) {
+$("#pylmm_compute").on("click", (function(_this) {
   return function() {
     var form_data, url;
-    $("#progress_bar_container").modal({
-      show: true
-    });
+    $("#progress_bar_container").modal();
     url = "/marker_regression";
     $('input[name=method]').val("pylmm");
     $('input[name=num_perm]').val($('input[name=num_perm_pylmm]').val());
@@ -154,7 +140,7 @@ $("#pylmm_compute").click((function(_this) {
   };
 })(this));
 
-$("#rqtl_geno_compute").click((function(_this) {
+$("#rqtl_geno_compute").on("click", (function(_this) {
   return function() {
     var form_data, url;
     $("#progress_bar_container").modal();
@@ -169,14 +155,12 @@ $("#rqtl_geno_compute").click((function(_this) {
   };
 })(this));
 
-$("#plink_compute").click((function(_this) {
+$("#plink_compute").on("click", (function(_this) {
   return function() {
     var form_data, url;
     $("#static_progress_bar_container").modal();
     url = "/marker_regression";
     $('input[name=method]').val("plink");
-    $('input[name=mapping_display_all]').val($('input[name=display_all_plink]').val());
-    $('input[name=suggestive]').val($('input[name=suggestive_plink]').val());
     $('input[name=maf]').val($('input[name=maf_plink]').val());
     form_data = $('#trait_data_form').serialize();
     console.log("form_data is:", form_data);
@@ -184,7 +168,7 @@ $("#plink_compute").click((function(_this) {
   };
 })(this));
 
-$("#gemma_compute").click((function(_this) {
+$("#gemma_compute").on("click", (function(_this) {
   return function() {
     var form_data, url;
     console.log("RUNNING GEMMA");
@@ -198,6 +182,23 @@ $("#gemma_compute").click((function(_this) {
   };
 })(this));
 
+$("#interval_mapping_compute").on("click", (function(_this) {
+  return function() {
+    var form_data, url;
+    showalert("One or more outliers exist in this data set. Please review values before mapping. Including outliers when mapping may lead to misleading results. We recommend <A HREF=\"http://en.wikipedia.org/wiki/Winsorising\">winsorising</A> the outliers or simply deleting them.", "alert-success");
+    console.log("In interval mapping");
+    $("#progress_bar_container").modal();
+    url = "/interval_mapping";
+    $('input[name=method]').val("reaper");
+    $('input[name=manhattan_plot]').val($('input[name=manhattan_plot_reaper]:checked').val());
+    $('input[name=mapping_display_all]').val($('input[name=display_all_reaper]'));
+    $('input[name=suggestive]').val($('input[name=suggestive_reaper]'));
+    form_data = $('#trait_data_form').serialize();
+    console.log("form_data is:", form_data);
+    return do_ajax_post(url, form_data);
+  };
+})(this));
+
 composite_mapping_fields = function() {
   return $(".composite_fields").toggle();
 };
@@ -220,4 +221,4 @@ $("#choose_closet_control").change(function() {
 
 $("#display_all_lrs").change(function() {
   return toggle_enable_disable("#suggestive_lrs");
-});
+});
\ No newline at end of file
diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index 462a59a2..78682710 100755
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -1,3 +1,4 @@
+{% from "base_macro.html" import header, flash_me, timeago %}
 <!DOCTYPE HTML>
 <html lang="en">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -10,12 +11,6 @@
     <link REL="stylesheet" TYPE="text/css" href="/static/packages/bootstrap/css/bootstrap.css" />
     <link REL="stylesheet" TYPE="text/css" href="/static/packages/bootstrap/css/non-responsive.css" />
     <link REL="stylesheet" TYPE="text/css" href="/static/packages/bootstrap/css/docs.css" />
-
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-        <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
     <link rel="stylesheet" type="text/css" href="/static/packages/colorbox/example4/colorbox.css"  />
     <link rel="stylesheet" type="text/css" href="/static/new/css/main.css"  />
     <link rel="stylesheet" type="text/css" href="/static/new/css/parsley.css"  />
@@ -25,37 +20,6 @@
 
 </head>
 
-{% macro header(main, second) %}
-    <header class="jumbotron subhead" id="overview" >
-        <div class="container">
-            <h1>{{ main }}</h1>
-            <p class="lead">
-               {{ second }}
-            </p>
-        </div>
-    </header>
-
-    {{ flash_me() }}
-{% endmacro %}
-
-
-{% macro flash_me() -%}
-    {% with messages = get_flashed_messages(with_categories=true) %}
-        {% if messages %}
-        <div class="container">
-            {% for category, message in messages %}
-                <div class="alert {{ category }}">{{ message }}</div>
-            {% endfor %}
-        </div>
-        {% endif %}
-    {% endwith %}
-{% endmacro %}
-
-{% macro timeago(timestamp) %}
-<time class="timeago" datetime="{{ timestamp }}">{{ timestamp }}</time>
-{% endmacro %}
-
-
 <body style="width: 1500px !important;">
     <!-- Navbar ================================================== -->
 
diff --git a/wqflask/wqflask/templates/base_macro.html b/wqflask/wqflask/templates/base_macro.html
new file mode 100644
index 00000000..c2905ebe
--- /dev/null
+++ b/wqflask/wqflask/templates/base_macro.html
@@ -0,0 +1,28 @@
+{% macro flash_me() -%}
+    {% with messages = get_flashed_messages(with_categories=true) %}
+        {% if messages %}
+        <div class="container">
+            {% for category, message in messages %}
+                <div class="alert {{ category }}">{{ message }}</div>
+            {% endfor %}
+        </div>
+        {% endif %}
+    {% endwith %}
+{% endmacro %}
+
+{% macro header(main, second) %}
+    <header class="jumbotron subhead" id="overview" >
+        <div class="container">
+            <h1>{{ main }}</h1>
+            <p class="lead">
+               {{ second }}
+            </p>
+        </div>
+    </header>
+
+    {{ flash_me() }}
+{% endmacro %}
+
+{% macro timeago(timestamp) %}
+<time class="timeago" datetime="{{ timestamp }}">{{ timestamp }}</time>
+{% endmacro %}
diff --git a/wqflask/wqflask/templates/interval_mapping.html b/wqflask/wqflask/templates/interval_mapping.html
deleted file mode 100755
index 82a96ba1..00000000
--- a/wqflask/wqflask/templates/interval_mapping.html
+++ /dev/null
@@ -1,116 +0,0 @@
-{% block css %}
-<!--    <link rel="stylesheet" type="text/css" href="/static/new/css/interval_mapping.css" />-->
-    <link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/css/jquery.dataTables.css" />
-    <link rel="stylesheet" type="text/css" href="/static/packages/DT_bootstrap/DT_bootstrap.css" />
-    <link rel="stylesheet" type="text/css" href="/static/packages/TableTools/media/css/TableTools.css" />
-    <link rel="stylesheet" type="text/css" href="/static/new/css/d3-tip.min.css" />
-    <link rel="stylesheet" type="text/css" href="/static/new/css/panelutil.css" />
-{% endblock %}
-{% block content %} <!-- Start of body -->
-
-
-    <div id="mapping_results" class="container">
-        <div>
-            <h2>
-                Whole Genome Mapping
-            </h2>
-            <form style ='float: left; padding: 5px;' id="exportform" action="export" method="post">
-              <input type="hidden" id="data" name="data" value="">
-              <input type="hidden" id="filename" name="filename" value="">
-              <input type="submit" id="export" value="Download SVG">
-            </form>
-            <form style ='float: left; padding: 5px;' id="exportpdfform" action="export_pdf" method="post">
-              <input type="hidden" id="data" name="data" value="">
-              <input type="hidden" id="filename" name="filename" value="">
-              <input type="submit" id="export_pdf" value="Download PDF">
-            </form>
-        </div>
-        <div id="chart_container">
-            <div class="qtlcharts" id="topchart">
-                
-            </div>
-        </div>
-        <div>
-            <h2>
-                Results
-            </h2>
-        </div>
-        <table cellpadding="0" cellspacing="0" border="0" id="qtl_results" class="table table-hover table-striped table-bordered">
-            <thead>
-                <tr>
-                    <td>Index</td>
-                    <td>LRS Score</td>
-                    <td>Chr</td>
-                    <td>Mb</td>
-                    <td>Locus</td>
-                    <td>Additive Effect</td>
-                </tr>
-            </thead>
-            <tbody>
-                {% for marker in qtl_results %}
-                <tr>
-                    <td>{{ loop.index }}</td>
-                    <td>{{ marker.lrs_value|float }}</td>
-                    <td>{{ marker.chr|int }}</td>
-                    <td>{{ marker.Mb|float  }}</td>
-                    <td>{{ marker.name }}</td>
-                    <td>{{ marker.additive|float }}</td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    
-    </div>
-
-    <!-- End of body -->
-
-{% endblock %}
-
-{% block js %}  
-    <script>
-        js_data = {{ js_data | safe }}
-    </script>
-
-    <!--[if lt IE 9]>
-<!--        <script language="javascript" type="text/javascript" src="/static/packages/jqplot/excanvas.js"></script>-->
-    <![endif]-->
-    <script language="javascript" type="text/javascript" src="http://d3js.org/d3.v3.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/js_external/d3-tip.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/javascript/panelutil.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/javascript/chr_interval_map.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/javascript/lod_chart.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/javascript/create_lodchart.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.dataTables.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.scientific.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/packages/DT_bootstrap/DT_bootstrap.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/packages/TableTools/media/js/TableTools.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/packages/underscore/underscore-min.js"></script>
-
-    <script type="text/javascript" charset="utf-8">
-        $(document).ready( function () {
-            console.time("Creating table");
-            $('#qtl_results').dataTable( {
-                //"sDom": "<<'span3'l><'span3'T><'span4'f>'row-fluid'r>t<'row-fluid'<'span6'i><'span6'p>>",
-                "sDom": "lTftipr",
-                "oTableTools": {
-                    "aButtons": [
-                        "copy",
-                        "print",
-                        {
-                            "sExtends":    "collection",
-                            "sButtonText": 'Save <span class="caret" />',
-                            "aButtons":    [ "csv", "xls", "pdf" ]
-                        }
-                    ],
-                    "sSwfPath": "/static/packages/TableTools/media/swf/copy_csv_xls_pdf.swf"
-                },
-                "iDisplayLength": 50,
-                "bLengthChange": true,
-                "bDeferRender": true,
-                "bSortClasses": false
-            } );
-            console.timeEnd("Creating table");
-        });
-    </script>
-{% endblock %}
\ No newline at end of file
diff --git a/wqflask/wqflask/templates/marker_regression.html b/wqflask/wqflask/templates/marker_regression.html
index 6aed69d5..0cd004cd 100755
--- a/wqflask/wqflask/templates/marker_regression.html
+++ b/wqflask/wqflask/templates/marker_regression.html
@@ -1,15 +1,5 @@
-{% extends "base.html" %}
-{% block title %}Interval Mapping{% endblock %}
-{% block css %}
-<!--    <link rel="stylesheet" type="text/css" href="/static/new/css/interval_mapping.css" />-->
-    <link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/css/jquery.dataTables.css" />
-    <link rel="stylesheet" type="text/css" href="/static/packages/DT_bootstrap/DT_bootstrap.css" />
-    <link rel="stylesheet" type="text/css" href="/static/packages/TableTools/media/css/TableTools.css" />
-    <link rel="stylesheet" type="text/css" href="/static/new/css/d3-tip.min.css" />
-    <link rel="stylesheet" type="text/css" href="/static/new/css/panelutil.css" />
-{% endblock %}
-{% block content %} <!-- Start of body -->
-
+{% from "base_macro.html" import header %}
+{% block content %}
     {{ header("Mapping",
         '{}: {}'.format(this_trait.name, this_trait.description_fmt)) }}
 
@@ -75,28 +65,6 @@
         js_data = {{ js_data | safe }}
     </script>
 
-    <!--[if lt IE 9]>
-<!--        <script language="javascript" type="text/javascript" src="/static/packages/jqplot/excanvas.js"></script>-->
-    <![endif]-->
-    <script language="javascript" type="text/javascript" src="http://d3js.org/d3.v3.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/js_external/d3-tip.min.js"></script>
-<!--    <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/jspdf.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/libs/FileSaver.js/FileSaver.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/libs/Blob.js/BlobBuilder.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/jspdf.plugin.standard_fonts_metrics.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/jspdf.plugin.from_html.js"></script>-->
-    <script language="javascript" type="text/javascript" src="/static/new/javascript/panelutil.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/javascript/chr_lod_chart.js"></script>
-<!--    <script language="javascript" type="text/javascript" src="/static/new/javascript/manhattan_plot.js"></script>-->
-    <script language="javascript" type="text/javascript" src="/static/new/javascript/lod_chart.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/javascript/create_lodchart.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.dataTables.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.scientific.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/packages/DT_bootstrap/DT_bootstrap.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/packages/TableTools/media/js/TableTools.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/packages/underscore/underscore-min.js"></script>
-
     <script type="text/javascript" charset="utf-8">
         $(document).ready( function () {
             console.time("Creating table");
@@ -123,4 +91,4 @@
             console.timeEnd("Creating table");
         });
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/wqflask/wqflask/templates/old_index_page.html b/wqflask/wqflask/templates/old_index_page.html
deleted file mode 100755
index db0b2d9e..00000000
--- a/wqflask/wqflask/templates/old_index_page.html
+++ /dev/null
@@ -1,320 +0,0 @@
-{% extends "base.html" %}
-{% block title %}GeneNetwork{% endblock %}
-{% block content %} 
-  <!-- Start of body -->
-    <tr>
-      <td bgcolor="#EEEEEE" class="solidBorder">
-        <table width="100%" cellspacing="0" cellpadding="5">
-          <tr>
-            <td valign="top" width="40%" align="left" height="10" bgcolor="#EEEEEE">
-              <p style="font-size:18px;font-family:verdana;color:black"><b>Select and
-              Search</b></p>
-
-              <form method="get" action="/search" class="form-search" name="SEARCHFORM">
-                <table width="100%">
-                  <!--  SPECIES  SELECTION -->
-
-                  <tr>
-                    <td align="right" height="35" style=
-                    "font-size:14px;font-family:verdana;color:black" width="16%">
-                    <b>Species:</b></td>
-
-                    <td width="3%"></td>
-
-                    <td nowrap width="85%" align="left">
-                      <div id="menu0">
-                        <select name="species" size="1" id="species" onchange=
-                        "fillOptions('species');">
-                          </select>
-                      </div>
-                    </td>
-                  </tr><!--  GROUP  SELECTION -->
-
-                  <tr>
-                    <td align="right" height="35" style=
-                    "font-size:14px;font-family:verdana;color:black"><b>Group:</b></td>
-
-                    <td width="3%"></td>
-
-                    <td nowrap width="85%" align="left">
-                      <div id="menu1">
-                        <select name="cross" size="1" id="cross" onchange="fillOptions('cross');">
-                          </select> <input type="button" class="btn" value="Info" onclick=
-                          "javascript:crossinfo();">
-                      </div>
-                    </td>
-                  </tr><!--  TYPE  SELECTION -->
-
-                  <tr>
-                    <td align="right" height="35" style=
-                    "font-size:14px;font-family:verdana;color:black"><b>Type:</b></td>
-
-                    <td width="3%"></td>
-
-                    <td nowrap width="85%" align="left">
-                      <div id="menu2">
-                        <select name="tissue" size="1" id="tissue" onchange=
-                        "fillOptions('tissue');">
-                          </select>
-                      </div>
-                    </td>
-                  </tr><!--  DATABASE  SELECTION -->
-
-                  <tr>
-                    <td align="right" height="35" style=
-                    "font-size:14px;font-family:verdana;color:black"><b>Database:</b></td>
-
-                    <td width="3%"></td>
-
-                    <td nowrap width="85%" align="left">
-                      <div id="menu3">
-                        <select name="database" size="1" id="database">
-                          </select> <input type="submit" class="btn" value="Info" name=
-                          "info_database">
-                      </div>
-                    </td>
-                  </tr><!--  USER HELP   -->
-
-                  <tr>
-                    <td align="right" height="20" width="10%"></td>
-
-                    <td width="3%"></td>
-
-                    <td align="left" width="85%">
-                      <p class="fs12">&nbsp;&nbsp;&nbsp;&nbsp;Databases marked with <b>**</b>
-                      suffix are not public yet.<br>
-                      &nbsp;&nbsp;&nbsp;&nbsp;Access requires <a href="/account.html" target=
-                      "_blank" class="fs14"><small>user login</small></a>.</p>
-                    </td>
-                  </tr><!--  GET ANY  SEARCH -->
-
-                  <tr>
-                    <td align="right" height="35" nowrap="on" style=
-                    "font-size:14px;font-family:verdana;color:black" width="10%">
-                    <b>Search:</b></td>
-
-                    <td width="3%"></td>
-
-                    <td nowrap width="85%" align="left"><input class="input-medium search-query"
-                    id="tfor" name="search_terms" style=
-                    "width:420px; background-color:white; font-family:verdana; font-size:14px"
-                    type="text" maxlength="500"></td>
-                  </tr><!--  GET ANY HELP   -->
-
-                  <tr>
-                    <td align="right" height="20" width="10%"></td>
-
-                    <td width="3%"></td>
-
-                    <td width="85%" align="left">
-                      <p class="fs12">&nbsp;&nbsp;&nbsp;&nbsp;Enter terms, genes, ID numbers in the
-                      <b>Search</b> field.<br>
-                      &nbsp;&nbsp;&nbsp;&nbsp;Use <b>*</b> or <b>?</b> wildcards (Cyp*a?,
-                      synap*).<br>
-                      &nbsp;&nbsp;&nbsp;&nbsp;Use <b>quotes</b> for terms such as <i>"tyrosine
-                      kinase"</i>.</p>
-                    </td>
-                  </tr><!--  SEARCH, MAKE DEFAULT, ADVANCED SEARCH -->
-
-                  <tr align="center">
-                    <td width="3%"></td>
-
-                    <td width="3%"></td>
-
-                    <td align="left" height="40" colspan="3"><input id="btsearch" type="submit"
-                    class="btn btn-primary" value="Search">&nbsp;&nbsp;&nbsp;&nbsp; <input type=
-                    "button" class="btn" value="Make Default" onclick=
-                    "setDefault(this.form);">&nbsp;&nbsp;&nbsp;&nbsp; <input type="button" class=
-                    "btn" value="Advanced Search" onclick=
-                    "javascript:window.open('/index3.html', '_self');"></td>
-                  </tr>
-                </table><input type="hidden" name="FormID" value="searchResult"> <input type=
-                "hidden" name="RISet" value="BXD"> <script src="/javascript/selectDatasetMenu.js"
-                type="text/javascript">
-</script>
-              </form><!--  QUICK HELP  -->
-
-              <p>&nbsp;______________________________________________________</p>
-
-              <p style="font-size:13px;font-family:verdana;color:black"><b>&nbsp; Quick HELP
-              Examples and</b> <a href="http://www.genenetwork.org/index4.html" target="_blank"
-              class="fs14"><b>User's Guide</b></a></p>&nbsp;&nbsp;You can also use advanced
-              commands. Copy these simple examples<br>
-              &nbsp;&nbsp;into the <b>Get Any</b> or <b>Combined</b> search fields:
-
-              <ul style="font-size:12px;font-family:verdana;color:black">
-                <li><b><i>POSITION=(chr1 25 30)</i></b> finds genes, markers, or transcripts on
-                chromosome 1 between 25 and 30 Mb.</li>
-
-                <li><b><i>MEAN=(15 16) LRS=(23 46)</i></b> in the <b>Combined</b> field finds
-                highly expressed genes (15 to 16 log2 units) AND with peak <a href=
-                "http://www.genenetwork.org/glossary.html#L" target="_blank" class=
-                "fs14"><small>LRS</small></a> linkage between 23 and 46.</li>
-
-                <li><b><i>RIF=mitochondrial</i></b> searches RNA databases for <a href=
-                "http://www.ncbi.nlm.nih.gov/projects/GeneRIF/GeneRIFhelp.html" target="_blank"
-                class="fs14"><small>GeneRIF</small></a> links.</li>
-
-                <li><b><i>WIKI=nicotine</i></b> searches <a href=
-                "http://www.genenetwork.org/webqtl/main.py?FormID=geneWiki" target="_blank" class=
-                "fs14"><small>GeneWiki</small></a> for genes that you or other users have annotated
-                with the word <i>nicotine</i>.</li>
-
-                <li><b><i>GO:0045202</i></b> searches for synapse-associated genes listed in the
-                <a href="http://www.godatabase.org/cgi-bin/amigo/go.cgi" target="_blank" class=
-                "fs14"><small>Gene Ontology</small></a>.</li>
-
-                <li><b><i>GO:0045202 LRS=(9 99 Chr4 122 155) cisLRS=(9 999 10)</i></b><br>
-                in <b>Combined</b> finds synapse-associated genes with <a href=
-                "http://www.genenetwork.org/glossary.html#E" target="_blank" class=
-                "fs14"><small>cis eQTL</small></a> on Chr 4 from 122 and 155 Mb with LRS scores
-                between 9 and 999.</li>
-
-                <li><b><i>RIF=diabetes LRS=(9 999 Chr2 100 105) transLRS=(9 999 10)</i></b><br>
-                in <b>Combined</b> finds diabetes-associated transcripts with peak <a href=
-                "http://www.genenetwork.org/glossary.html#E" target="_blank" class=
-                "fs14"><small>trans eQTLs</small></a> on Chr 2 between 100 and 105 Mb with LRS
-                scores between 9 and 999.</li>
-              </ul>
-            </td><!-- END OF FIND SELECTOR PULL-DOWN PANEL (LEFT SIDE)  -->
-            <!-- START OF TOP RIGHT PANEL  -->
-
-            <td valign="top" width="40%" bgcolor="#FFFFFF">
-              <p style="font-size:15px;font-family:verdana;color:black"><b>Websites Affiliated with
-              GeneNetwork</b></p>
-
-              <p style="font-size:12px;font-family:verdana;color:black"></p>
-
-              <ul>
-                <li><a href="http://ucscbrowser.genenetwork.org/" target="_blank">Genome
-                Browser</a> at UTHSC</li>
-
-                <li><a href="http://galaxy.genenetwork.org/" target="_blank">Galaxy</a> at
-                UTHSC</li>
-
-                <li>GeneNetwork at <a href="http://ec2.genenetwork.org/" target="_blank">Amazon
-                Cloud (EC2)</a></li>
-
-                <li>GeneNetwork Source Codes at <a href=
-                "http://sourceforge.net/projects/genenetwork/" target="_blank">SourceForge</a></li>
-
-                <li>GeneNetwork Source Codes at <a href=
-                "https://github.com/genenetwork/genenetwork" target="_blank">GitHub</a></li>
-              </ul>
-
-              <p>____________________________</p>
-
-              <p style="font-size:15px;font-family:verdana;color:black"><b>Getting Started</b>
-              &nbsp;&nbsp;</p>
-
-              <ol style="font-size:12px;font-family:verdana;color:black">
-                <li>Select <b>Species</b> (or select All)</li>
-
-                <li>Select <b>Group</b> (a specific sample)</li>
-
-                <li>Select <b>Type</b> of data:
-
-                  <ul>
-                    <li>Phenotype (traits)</li>
-
-                    <li>Genotype (markers)</li>
-
-                    <li>Expression (mRNAs)</li>
-                  </ul>
-                </li>
-
-                <li>Select a <b>Database</b></li>
-
-                <li>Enter search terms in the <b>Get Any</b> or <b>Combined</b> field: words,
-                genes, ID numbers, probes, advanced search commands</li>
-
-                <li>Click on the <b>Search</b> button</li>
-
-                <li>Optional: Use the <b>Make Default</b> button to save your preferences</li>
-              </ol>
-
-              <p>____________________________</p>
-
-              <p style="font-size:14px;font-family:verdana;color:black"><b>How to Use
-              GeneNetwork</b></p>
-
-              <blockquote>
-                <p style="font-size:12px;font-family:verdana;color:black">Take a 20-40 minute
-                GeneNetwork <a href="http://www.genenetwork.org/tutorial/WebQTLTour/" target=
-                "_blank" class="fs14"><small>Tour</small></a> that includes screen shots and
-                typical steps in the analysis.</p>
-              </blockquote>
-
-              <blockquote>
-                <p style="font-size:12px;font-family:verdana;color:black">For information about
-                resources and methods, select the <img src=
-                "http://www.genenetwork.org/images/upload/Info.png" alt="INFO" border="0" valign=
-                "middle"> buttons.</p>
-
-                <p style="font-size:12px;font-family:verdana;color:black">Try the <a href=
-                "http://alexandria.uthsc.edu/" target="_blank" class=
-                "fs14"><small>Workstation</small></a> site to explore data and features that are
-                being implemented.</p>
-
-                <p style="font-size:12px;font-family:verdana;color:black">Review the <a href=
-                "/conditionsofUse.html" target="_blank" class="fs14"><small>Conditions</small></a>
-                and <a href="/statusandContact.html" target="_blank" class=
-                "fs14"><small>Contacts</small></a> pages for information on the status of data sets
-                and advice on their use and citation.</p>
-              </blockquote>
-
-              <p style="font-size:14px;font-family:verdana;color:black"><b>Mirror and Development
-              Sites</b></p>
-
-              <ul>
-                <li><a href="http://www.genenetwork.org/" target="_blank" style=
-                "font-size:12px;font-family:verdana;color:blue">Main GN site at UTHSC</a> (main
-                site)</li>
-
-                <li><a href="http://www.genenetwork.waimr.uwa.edu.au/" target="_blank" style=
-                "font-size:12px;font-family:verdana;color:blue">Australia at the UWA</a></li>
-
-                <li><a href="http://gn.genetics.ucla.edu/" target="_blank" style=
-                "font-size:12px;font-family:verdana;color:blue">California at UCLA</a></li>
-
-                <li><a href="http://genenetwork.helmholtz-hzi.de/" target="_blank" style=
-                "font-size:12px;font-family:verdana;color:blue">Germany at the HZI</a></li>
-
-                <li><a href="https://genenetwork.hubrecht.eu/" target="_blank" style=
-                "font-size:12px;font-family:verdana;color:blue">Netherlands at the Hubrecht</a>
-                (Development)</li>
-
-                <li><a href="http://genenetwork.memphis.edu/" target="_blank" style=
-                "font-size:12px;font-family:verdana;color:blue">Memphis at the U of M</a></li>
-
-                <li><a href="http://webqtl.bic.nus.edu.sg/" target="_blank" style=
-                "font-size:12px;font-family:verdana;color:blue">Singapore at the NUS</a></li>
-
-                <li><a href="http://genenetwork.epfl.ch/" target="_blank" style=
-                "font-size:12px;font-family:verdana;color:blue">Switzerland at the EPFL</a></li>
-              </ul>
-
-              <p style="font-size:14px;font-family:verdana;color:black"><b>History and
-              Archive</b></p>
-
-              <blockquote>
-                <p style="font-size:12px;font-family:verdana;color:black">GeneNetwork's <a href=
-                "http://artemis.uthsc.edu" target="_blank" class="fs14"><small>Time
-                Machine</small></a> links to earlier versions that correspond to specific
-                publication dates.</p>
-              </blockquote>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-    <!-- End of body -->
-    <script src="/javascript/searchtip.js" type="text/javascript">
-    </script>
-    <script type="text/javascript">
-      $(document).ready(function () {
-                initialDatasetSelection();
-        });
-    </script>
-{% endblock %}
-
diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html
index 1f53e089..cdde5d9d 100755
--- a/wqflask/wqflask/templates/show_trait.html
+++ b/wqflask/wqflask/templates/show_trait.html
@@ -12,6 +12,8 @@
     <link rel="stylesheet" type="text/css" href="/static/new/packages/nvd3/nv.d3.min.css" />
     <link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/css/jquery.dataTables.css" />
     <link rel="stylesheet" type="text/css" href="/static/packages/DT_bootstrap/DT_bootstrap.css" />
+    <link rel="stylesheet" type="text/css" href="/static/packages/TableTools/media/css/TableTools.css" />
+
 {% endblock %}
 {% block content %} <!-- Start of body -->
 
@@ -133,13 +135,19 @@
     <script type="text/javascript" src="/static/new/javascript/show_trait.js"></script>
     <script type="text/javascript" src="/static/new/javascript/get_traits_from_collection.js"></script>
     <script type="text/javascript" src="/static/new/javascript/validation.js"></script>
-    
-    <script language="javascript" type="text/javascript" src="/static/packages/bootstrap/js/bootstrap.min.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/libs/FileSaver.js/FileSaver.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/libs/Blob.js/BlobBuilder.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/jspdf.plugin.standard_fonts_metrics.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/packages/jsPDF/jspdf.plugin.from_html.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/chr_lod_chart.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/create_lodchart.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/lod_chart.js"></script>
+
     <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.dataTables.min.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.scientific.js"></script>
     <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.naturalSort.js"></script>
     <script language="javascript" type="text/javascript" src="/static/packages/DT_bootstrap/DT_bootstrap.js"></script>
     <script language="javascript" type="text/javascript" src="/static/packages/TableTools/media/js/TableTools.min.js"></script>
-"></script>
     <script type="text/javascript" charset="utf-8">
             
            function getValue(x) {
diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html
index bd1e6f1e..1550647a 100755
--- a/wqflask/wqflask/templates/show_trait_mapping_tools.html
+++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html
@@ -66,7 +66,7 @@
                         </div>
                         <div class="form-group">
                             <div style="padding-left:15px;" class="controls">
-                                <button id="pylmm_compute" class="btn submit_special btn-primary" data-url="/marker_regression" title="Compute Marker Regression">
+                                <button id="pylmm_compute" class="btn submit_special btn-primary" title="Compute Marker Regression">
                                     <i class="icon-ok-circle icon-white"></i> Open Mapping Tool
                                 </button>
                             </div>
diff --git a/wqflask/wqflask/templates/show_trait_progress_bar.html b/wqflask/wqflask/templates/show_trait_progress_bar.html
index 99906338..f9a34070 100755
--- a/wqflask/wqflask/templates/show_trait_progress_bar.html
+++ b/wqflask/wqflask/templates/show_trait_progress_bar.html
@@ -32,17 +32,4 @@
       </div>
     </div>
   </div>
-</div>
-
-<!--<div id="static_progress_bar_container" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="progress_bar" aria-hidden="true">
-  <div class="modal-header">
-    <h3 id="progress_bar">Loading... (Estimated time ~10-15m)</h3>
-  </div>
-    <div class="modal-body">
-        <div class="progress progress-striped active">
-            <div id="marker_regression_progress" class="bar" style="width: 100%"></div>
-        </div>
-        <div id="time_remaining">
-        </div>
-    </div>
-</div>-->
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 79c1c967..f9b27207 100755
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -288,6 +288,10 @@ def heatmap_page():
     
     return rendered_template
 
+@app.route("/mapping_results_container")
+def mapping_results_container_page():
+    return render_template("mapping_results_container.html")
+
 @app.route("/marker_regression", methods=('POST',))
 def marker_regression_page():
     initial_start_vars = request.form
@@ -312,7 +316,7 @@ def marker_regression_page():
         if key in wanted or key.startswith(('value:')):
             start_vars[key] = value
 
-    version = "v4"
+    version = "v3"
     key = "marker_regression:{}:".format(version) + json.dumps(start_vars, sort_keys=True)
     print("key is:", pf(key))
     with Bench("Loading cache"):
@@ -439,7 +443,7 @@ def interval_mapping_page():
         Redis.expire(key, 60*60)
 
     with Bench("Rendering template"):
-        rendered_template = render_template("interval_mapping.html", **result)
+        rendered_template = render_template("marker_regression.html", **result)
 
     return rendered_template