initial commit (from resynch'd fork)