Begin new local storage logic placement in Controller