diff --git a/BSParse.hs b/BSParse.hs
new file mode 100644
--- /dev/null
+++ b/BSParse.hs
@@ -0,0 +1,132 @@
+{-# OPTIONS_GHC -fbang-patterns #-}
+module BSParse (parseArgs,runParse,getInterp,TclWord(..),dropWhite) where
+import qualified Data.ByteString.Char8 as B
+import Control.Monad
+import Data.Char
+import Test.HUnit  -- IGNORE
+
+data TclWord = Word B.ByteString | Subcommand [TclWord] | NoSub B.ByteString deriving (Show,Eq)
+
+dispatch str = do h <- safeHead str
+                  case h of
+                   '{' -> nested str 
+                   '[' -> parseSub str
+                   '"' -> parseStr str
+                   _  -> getword str
+
+parseArgs = multi (dispatch . dropWhite)
+runParse = multi (mainparse . dropWhite)
+
+safeHead s = guard (not (B.null s)) >> return (B.head s)
+
+
+getInterp str = do 
+   loc <- B.findIndex (\x -> x == '$' || x == '[') str
+   let locval = B.index str loc
+   if escaped loc str 
+     then do (p,v,r) <- getInterp (B.drop (loc+1) str)
+             return (B.append (B.take (loc-1) str) (B.cons locval p), v, r)
+     else let (pre,aft) = B.splitAt loc str in
+          case B.index str loc of
+           '$' -> do (s, rest) <- getword aft
+                     return (pre, s,rest)
+           '[' -> do (s, rest) <- parseSub aft
+                     return (pre, s, rest)
+
+mainparse str = do h <- safeHead str
+                   case h of 
+                    ';'  -> return ([], B.tail str) 
+                    '\n' -> return ([], B.tail str)
+                    '#'  -> eatcomment str
+                    _    -> parseArgs str
+
+multi p s = do (w,r) <- p s
+               case multi p r of
+                Nothing -> return ([w],r)
+                Just (wx,r2) -> return $! (w:wx,r2)
+
+parseSub s = do guard (B.head s == '[') 
+                (p,r) <- parseArgs (B.tail s)
+                loc <- B.elemIndex ']' r
+                let (pre,aft) = B.splitAt loc r
+                return (Subcommand p, B.tail aft)
+
+eatcomment = return . (,) [] . B.tail . B.dropWhile (/= '\n')
+
+dropWhite = B.dropWhile (\x -> x == ' ' || x == '\t')
+
+wordChar ' ' = False
+wordChar c = let ci = ord c in
+  (ord 'a' <= ci  && ci <= ord 'z') || (ord 'A' <= ci  && ci <= ord 'Z') || 
+  (ord '0' <= ci  && ci <= ord '9') || (c `B.elem` (B.pack "+-*=/:^$%!^&<>"))
+
+getword s = if B.null w then fail "can't parse word" else return (Word w,n)
+ where (w,n) = B.span wordChar s
+
+parseStr s = do loc <- B.elemIndex '"' str
+                let (w,r) = B.splitAt loc str 
+                if escaped loc str then do (Word w1, v) <- parseStr r
+                                           let nw =  B.snoc (B.take (B.length w - 1) w) '"'
+                                           return (ueword (B.append nw w1), v)
+                                   else return (ueword w, B.tail r)
+ where str = B.tail s
+       ueword = Word . strSub (B.pack "\\t", B.singleton '\t') . strSub (B.pack "\\n",B.singleton '\n')
+
+strSub (from,to) s = B.concat $ reverse $ breakUp s nls
+ where nls = reverse $ B.findSubstrings from s
+       breakUp x [] = [x]
+       breakUp x (i:xs) = let (a,b) = B.splitAt i x in (B.drop (B.length from) b):to:breakUp a xs
+
+escaped v s = escaped' v
+ where escaped' !i = if (i <= 0) then False else (B.index s (i-1) == '\\') && not (escaped' (i-1))
+
+
+nested s = do ind <- match 0 0
+              let (w,r) = B.splitAt ind s
+              return (NoSub (B.tail w), (B.tail r))
+ where match !c !i 
+        | B.length s <= i = fail $ "Couldn't match bracket" ++ show s
+        | otherwise       = 
+           case B.index s i of 
+            '}' -> if c == 1 then return i else match (c-1) (i+1)
+            '{' ->  match (c+1) (i+1)
+            _   ->  match c (i+1) 
+
+-- # TESTS # --
+
+testNested = "Fail nested" ~: Nothing ~=? nested (bp "  {       the end")
+testNested2 = "Pass nested" ~: Just (NoSub (bp "  { }"), B.empty) ~=? nested (bp "{  { }}")
+testNested3 = "Fail nested" ~: Nothing ~=? nested (bp "  { {  }")
+
+testEscaped = (escaped 1 (B.pack "\\\"")) ~? "pre-slashed quote should be escaped"
+testEscaped2 = TestCase $ assertBool "non-slashed quote not escaped"  (not (escaped 1 (B.pack " \"")))
+testEscaped3 = TestCase $ assertBool "pre-slashed quote should be escaped" (escaped 2 (B.pack " \\\""))
+testEscaped4 = TestCase $ assertBool "non-slashed quote not escaped"  (not (escaped 2 (B.pack "  \"")))
+
+bp = B.pack
+mklit = Word . bp 
+mkwd = Word . bp
+testParseStr = "Escaped works" ~: Just (mklit "Oh \"yeah\" baby.", B.empty) ~=? parseStr (bp "\"Oh \\\"yeah\\\" baby.\"")
+testParseStrLeft = "Parse Str with leftover" ~: Just (mklit "Hey there.", bp " 44") ~=? parseStr (bp "\"Hey there.\" 44")
+
+testGetInterp =  "Escaped $ works"   ~: Nothing ~=? getInterp (bp "a \\$variable")
+testGetInterp2 = "unescaped $ works" ~: Just (bp "a ", mkwd "$variable", bp "")  ~=? getInterp (bp "a $variable")
+testGetInterp3 = "Escaped ["   ~: Nothing ~=? getInterp (bp "a \\[sub] thing.")
+testGetInterp4 = "Escaped []"   ~: Nothing ~=? getInterp (bp "a \\[sub\\] thing.")
+testGetInterp5 = "Escaped [] crazy"   ~: 
+   Just (bp "a ",Subcommand [mkwd "sub",mklit "quail [puts 1]"], bp " thing.") ~=? getInterp (bp "a [sub \"quail [puts 1]\"] thing.")
+testGetInterp6 = "unescaped $ works" ~: Just (bp "a $", mkwd "$variable", bp "")  ~=? getInterp (bp "a \\$$variable")
+
+
+nestedTests= TestList [testNested, testNested2, testNested3]
+
+
+getInterpTests = TestList [ testGetInterp, testGetInterp2, testGetInterp3, testGetInterp4, testGetInterp5, testGetInterp6 ]
+
+
+tests = TestList [ nestedTests, testEscaped, testEscaped2, testEscaped3, testEscaped4, testParseStr, testParseStrLeft, 
+                   getInterpTests ]
+
+runUnit = runTestTT tests
+
+-- # ENDTESTS # --
diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+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 this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey 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 library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/Main.hs b/Main.hs
new file mode 100644
--- /dev/null
+++ b/Main.hs
@@ -0,0 +1,246 @@
+import Control.Monad.State
+import qualified Data.Map as Map
+import Control.Arrow
+import System.IO
+import Control.Monad.Error
+import System.Exit
+import Data.Char (toLower,toUpper)
+import Data.List (intersperse)
+import System.Environment
+import Data.Maybe
+import qualified Data.ByteString.Char8 as B
+import BSParse
+
+type BString = B.ByteString
+
+data Err = ERet BString | EBreak | EContinue | EDie String deriving (Show,Eq)
+
+instance Error Err where
+ noMsg    = EDie "An error occurred."
+ strMsg s = EDie s
+
+data TclEnv = TclEnv { vars :: VarMap, procs :: ProcMap, upMap :: Map.Map BString (Int,BString) } 
+type TclM = ErrorT Err (StateT [TclEnv] IO)
+type TclProc = [BString] -> TclM RetVal
+type ProcMap = Map.Map BString TclProc
+type VarMap = Map.Map BString BString
+
+type RetVal = BString -- IGNORE
+
+procMap :: ProcMap
+procMap = Map.fromList . map (B.pack *** id) $
+ [("proc",procProc),("set",procSet),("upvar",procUpVar),("puts",procPuts),("gets",procGets),
+  ("uplevel", procUpLevel),("if",procIf),("while",procWhile),("eval", procEval),("exit",procExit),
+  ("list",procList),("lindex",procLindex),("llength",procLlength),("return",procReturn),
+  ("break",procRetv EBreak),("catch",procCatch),("continue",procRetv EContinue),("eq",procEq),
+  ("string", procString), ("append", procAppend), ("info", procInfo)]
+   ++ map (id *** procMath) [("+",(+)), ("*",(*)), ("-",(-)), ("/",div), ("<", toI (<)),("<=",toI (<=)),("==",toI (==)),("!=",toI (/=))]
+
+io :: IO a -> TclM a
+io = liftIO
+
+toI :: (Int -> Int -> Bool) -> (Int -> Int -> Int)
+toI n a b = if n a b then 1 else 0
+
+baseEnv = TclEnv { vars = Map.empty, procs = procMap, upMap = Map.empty }
+
+main = do args <- getArgs 
+          hSetBuffering stdout NoBuffering
+          case args of
+             [] -> run repl
+             [f] -> B.readFile f >>= run . doTcl
+ where run p = evalStateT (runErrorT (p `catchError` perr >> ret)) [baseEnv] >> return ()
+       perr (EDie s) = io (hPutStrLn stderr s) >> ret
+       repl = do io (putStr "hiccup> ") 
+                 eof <- (io isEOF)
+                 if eof then ret
+                  else do ln <- procGets []
+                          if (not . B.null) ln then doTcl ln `catchError` perr >> repl else ret
+
+ret = return B.empty
+
+doTcl = runCmds . getParsed
+runCmds = liftM last . mapM runCommand
+
+getParsed str = case runParse str of 
+                 Nothing -> error $ "parse error: " ++ (B.unpack str) 
+                 Just (v,r) -> filter (not . null) v
+
+doCond str = case getParsed str of
+              [x]    -> runCommand x >>= return . isTrue
+              _      -> tclErr "Too many statements in conditional"
+ where isTrue = (/= B.pack "0") . trim
+
+trim = B.reverse . dropWhite . B.reverse . dropWhite
+
+withScope :: TclM RetVal -> TclM RetVal
+withScope f = do
+  (o:old) <- get
+  put $ (baseEnv { procs = procs o }) : o : old
+  ret <- f
+  get >>= put . tail
+  return ret
+
+set :: BString -> BString -> TclM ()
+set str v = do env <- liftM head get
+               case upped str env of
+                 Just (i,s) -> uplevel i (set s v)
+                 Nothing -> do es <- liftM tail get
+                               put ((env { vars = Map.insert str v (vars env) }):es)
+
+upped s e = Map.lookup s (upMap e)
+
+getProc str = get >>= return . Map.lookup str . procs . head
+regProc name pr = modify (\(x:xs) -> (x { procs = Map.insert name pr (procs x) }):xs) >> ret
+
+evalw :: TclWord -> TclM RetVal
+evalw (Word s)      = interp s
+evalw (NoSub s)     = return s
+evalw (Subcommand c) = runCommand c
+
+ptrace = False -- IGNORE
+
+runCommand :: [TclWord] -> TclM RetVal
+runCommand [Subcommand s] = runCommand s
+runCommand args = do 
+ (name:evArgs) <- mapM evalw args
+ when ptrace $ io . print $ (name,args) -- IGNORE
+ proc <- getProc name
+ maybe (tclErr ("invalid command name: " ++ show name)) ($! evArgs) proc
+
+procProc, procSet, procPuts, procIf, procWhile, procReturn, procUpLevel :: TclProc
+procSet [s1,s2] = set s1 s2 >> return s2
+procSet _       = tclErr $ "set: Wrong arg count"
+
+procPuts s@(sh:st) = (io . mapM_ puts) txt >> ret
+ where (puts,txt) = if sh == B.pack "-nonewline" then (B.putStr,st) else (B.putStrLn,s)
+procPuts x         = tclErr $ "Bad args to puts: " ++ show x
+
+procGets [] = io B.getLine >>= return
+procGets  _ = error "gets: Wrong arg count"
+
+procEq [a,b] = return . B.pack $ if a == b then "1" else "0"
+
+procMath :: (Int -> Int -> Int) -> TclProc
+procMath op [s1,s2] = liftM2 op (parseInt s1) (parseInt s2) >>= return . B.pack . show
+procMath op _       = tclErr "math: Wrong arg count"
+
+procEval [s] = doTcl s
+procEval x   = tclErr $ "Bad eval args: " ++ show x
+
+procExit [] = io (exitWith ExitSuccess)
+
+procCatch [s] = doTcl s `catchError` (const . return . B.pack) "0"
+
+procString (f:s:args) 
+ | f == B.pack "trim" = return (trim s)
+ | f == B.pack "tolower" = return (B.map toLower s)
+ | f == B.pack "toupper" = return (B.map toUpper s)
+ | f == B.pack "length" = return . B.pack . show . B.length $ s 
+ | f == B.pack "index" = case args of 
+                          [i] -> do ind <- parseInt i
+                                    if ind >= B.length s || ind < 0 then ret else return $ B.singleton (B.index s ind)
+                          _   -> tclErr $ "Bad args to string index."
+ | otherwise            = tclErr $ "Can't do string action: " ++ show f
+
+tclErr = throwError . EDie
+
+procInfo [x] = if x == B.pack "commands" then get >>= procList . Map.keys . procs . head
+                                         else tclErr $ "Unknown info command: " ++ show x
+
+procAppend (v:vx) = do val <- varGet v 
+                       procSet [v,B.concat (val:vx)]
+
+procList = return . B.concat . intersperse (B.singleton ' ') . map escape
+ where escape s = if B.elem ' ' s then B.concat [B.singleton '{', s, B.singleton '}'] else s
+
+procLindex [l,i] = do let items = map getDat . head . getParsed $ l
+                      return . (!!) items =<< (parseInt i)
+ where getDat (Word s)   = s
+       getDat (NoSub s)  = s
+       getDat x          = error $ "getDat doesn't understand: " ++ show x
+
+procLlength [lst] 
+  | B.null lst = return (B.pack "0")
+  | otherwise = return . B.pack . show . length . head . getParsed $ lst
+procLlength x = tclErr $ "Bad args to llength: " ++ show x
+
+procIf (cond:yes:rest) = do
+  condVal <- doCond cond
+  if condVal then doTcl yes
+    else case rest of
+          [s,blk] -> if s == B.pack "else" then doTcl blk else error "Invalid If"
+          (s:r)   -> if s == B.pack "elseif" then procIf r else error "Invalid If"
+          []      -> ret
+procIf x = tclErr "Not enough arguments to If."
+
+procWhile [cond,body] = loop `catchError` herr
+ where pbody = getParsed body 
+       herr EBreak    = ret
+       herr (ERet s)  = return s
+       herr EContinue = loop `catchError` herr
+       herr x         = throwError x
+       loop = do condVal <- doCond cond
+                 if condVal then runCmds pbody >> loop else ret
+
+procReturn [s] = throwError (ERet s)
+procRetv c [] = throwError c
+procError [s] = tclErr (B.unpack s)
+
+parseInt si = maybe (tclErr ("Bad int: " ++ show si)) (return . fst) (B.readInt si)
+
+procUpLevel [p]    = uplevel 1 (procEval [p]) 
+procUpLevel (si:p) = parseInt si >>= \i -> uplevel i (procEval p)
+
+uplevel i p = do 
+  (curr,new) <- liftM (splitAt i) get 
+  put new
+  res <- p
+  get >>= put . (curr ++)
+  return res
+
+procUpVar [s,d]    = upvar 1 s d
+procUpVar [si,s,d] = parseInt si >>= \i -> upvar i s d
+
+upvar n s d = do (e:es) <- get 
+                 put ((e { upMap = Map.insert s (n,d) (upMap e) }):es)
+                 ret
+
+procProc [name,body]      = regProc name (procRunner [] (getParsed body))
+procProc [name,args,body] = do
+  let params = case parseArgs args of
+                 Nothing -> error "Parse failed."
+                 Just (r,_) -> map to_s r
+  let pbody = getParsed body
+  regProc name (procRunner params pbody)
+ where to_s (Word b) = b
+
+procProc x = tclErr $ "proc: Wrong arg count (" ++ show (length x) ++ "): " ++ show x
+
+
+procRunner :: [BString] -> [[TclWord]] -> [BString] -> TclM RetVal
+procRunner pl body args = withScope $ do mapM_ (uncurry set) (zip pl args)
+                                         when ((not . null) pl && (last pl == B.pack "args")) $ do
+                                               val <- procList (drop ((length pl) - 1) args) 
+                                               set (B.pack "args") val 
+                                         runCmds body `catchError` herr
+ where herr (ERet s) = return s
+       herr x        = error (show x)
+
+varGet name = do env <- liftM head get
+                 case upped name env of
+                   Nothing -> maybe (tclErr ("can't read \"$" ++ B.unpack name ++ "\": no such variable")) 
+                                    return 
+                                    (Map.lookup name (vars env))
+                   Just (i,n) -> uplevel i (varGet n) 
+                   
+
+interp :: BString -> TclM RetVal
+interp str = case getInterp str of
+                   Nothing -> return str
+                   Just x -> handle x
+ where f (Word match) = varGet (B.tail match)
+       f x            = runCommand [x]
+       handle (b,m,a) = do pre <- liftM (B.append b) (f m)
+                           post <- interp a
+                           return (B.append pre post)
diff --git a/README b/README
new file mode 100644
--- /dev/null
+++ b/README
@@ -0,0 +1,6 @@
+To get things a-going', do:
+  runhaskell Setup.lhs configure
+  runhaskell Setup.lhs build
+
+
+I don't really recommend installing. Not too useful, and I've never tried it.
diff --git a/Setup.lhs b/Setup.lhs
new file mode 100644
--- /dev/null
+++ b/Setup.lhs
@@ -0,0 +1,3 @@
+#!/usr/bin/env runhaskell
+> import Distribution.Simple
+> main = defaultMain
diff --git a/example.tcl b/example.tcl
new file mode 100644
--- /dev/null
+++ b/example.tcl
@@ -0,0 +1,48 @@
+# Here is an example of some stuff hiccup can do.
+# I think it's neat.
+
+proc incr v {
+  upvar 1 loc $v
+  set loc [+ $loc 1]
+}
+
+proc decr v {
+  upvar loc $v
+  set loc [- $loc 1]
+}
+
+proc memfib x {
+  set loc {1 1}
+  set ctr 2
+  while { <= $ctr $x } {
+    set v1 [lindex $loc [- $ctr 1]]
+    set v2 [lindex $loc [- $ctr 2]]
+    set sum [+ $v1 $v2]
+    set loc "$loc $sum"
+    incr ctr
+  }
+  return [lindex $loc $x]
+}
+
+set fcount 21
+puts "First $fcount fibonacci numbers in descending order:"
+while {<= 2 $fcount} {
+  puts -nonewline "[memfib $fcount] "
+  decr fcount
+}
+puts "\nDone."
+
+proc foreach {vname lst what} {
+  set i 0
+  while {< $i [llength $lst]} {
+    uplevel "set $vname [lindex $lst $i]"
+    uplevel $what
+    incr i
+  }
+}
+
+
+foreach name {Spain China Russia Argentina} {
+  puts "I've never been to $name."
+}
+
diff --git a/hiccup.cabal b/hiccup.cabal
new file mode 100644
--- /dev/null
+++ b/hiccup.cabal
@@ -0,0 +1,15 @@
+Name:                hiccup
+Version:             0.2
+Description:         A simplistic interpreter for a subset of tcl 
+License:             GPL
+License-file:        LICENSE
+Author:              Kyle Consalus
+Maintainer:          consalus+hiccup@google.com
+Category:            Compilers/Interpreters
+Synopsis:            Simple tcl interpeter   
+Build-Depends:       base, HUnit, mtl
+extra-source-files:  BSParse.hs README example.tcl
+
+Executable:          hiccup
+Main-is:             Main.hs
+ghc-options:         -O2 -fglasgow-exts -fbang-patterns -funbox-strict-fields
diff --git a/hiccup.cabal~ b/hiccup.cabal~
new file mode 100644
--- /dev/null
+++ b/hiccup.cabal~
@@ -0,0 +1,13 @@
+Name:                hiccup
+Version:             0.2
+Description:         A simplistic interpreter for a subset of tcl 
+License:             GPL
+License-file:        LICENSE
+Author:              Kyle Consalus
+Maintainer:          consalus+hiccup@google.com
+Build-Depends:       base, HUnit, mtl
+extra-source-files:  BSParse.hs README example.tcl
+
+Executable:          hiccup
+Main-is:             Main.hs
+ghc-options:         -O2 -fglasgow-exts -fbang-patterns -funbox-strict-fields
