Changes to Object Structure. Full parser. Revised tests.