Got started on these two tasks, restructuring still needs a lot of work here

Started testing MetaModel while also refactoring a bit more by moving code between ExpDesign and MetaModel