Refactor Storage
Add thread manipulation
Add web