add storage module
beter reload logic, again