Lots and lots of changes

Yes, yes, I'll get it eventually
Added storage module