Added Storage, and a bunch of other things