Refactoring META WIP 8