Oops.  Forgot to commit all the stuff we did.
Started on Gestalt stuff.