Added everything from development done in stools.  Unfortunately there's no commit history for this.