Refactoring WIP 16