Worked on new Metadata system (Initial Completion)

Test suite shows 8 failures which appear to be existing failures.