Adding features and fixing bugs.  Now usable!