Fix bugs
Implement storage service but not enough. Change many things.