Made most storage methods actually work.