Refactoring WIP 14