Started working on getting metatheory working again