Have the Storage module mostly working and fixed a few minor issues.