Refactoring WIP 13