09/18 Shelving ; Resuming refactoring