implemented storage management methods, still needs testing