Add Storage for done status
rewrite methods for output