Working
Need to test the null storage option