09/25 Shelving ; Started improving design