Revert "Revert "More work on object.txt""

This reverts commit dafc3871516f9ae5f0a900528f0dce69acc566a7.