Refactoring Meta WIP 7