Continues work on meta rafactoring.