trimming continues.  Note: necessary code changes will break the Justin scene in this branch.