Fixed the last bug.  Ready to compile v 1.0!