Garrett/storage

Added more storage functions, fixed up some callback.js stuff, and added testing.