Added Savestate

Additional "require" changes made as well