Massive proxy refactoring.
Massive storage refactoring, error handling and bug fixing.