Moved to packages.json
Fixes some bugs
Fix fall out on resume